fix: adjust wx

Author: anotherso1a

copilot-demo/pages/Actions/index.axml

@@ -1,13 +1,20 @@
 <ant-container title="基础用法">
-  <ant-actions
-    items="{{basicActions}}"
-    onItemTap="handleTapAction"
-  />
+  <ant-actions items="{{basicActions}}" onItemTap="handleTapAction" />
 </ant-container>
 
 <ant-container title="配合bubble使用">
   <ant-switch checked="{{ showBubble }}" onChange="toggleBubble" />
-  <ant-bubble a:if="{{ showBubble }}" content="永和九年，岁在癸丑，暮春之初，会于会稽山阴之兰亭，修禊事也。群贤毕至，少长咸集。此地有崇山峻岭，茂林修竹，又有清流激湍，映带左右，引以为流觞曲水，列坐其次。虽无丝竹管弦之盛，一觞一咏，亦足以畅叙幽情。" typing="{{ { step: 2, interval: 50 } }}" onTypingComplete="onTypingComplete">
-    <ant-actions a:if="{{ loaded }}" slot="footer" items="{{bubbleActions}}" onItemTap="handleBubbleAction" />
+  <ant-bubble
+    a:if="{{ showBubble }}"
+    content="永和九年，岁在癸丑，暮春之初，会于会稽山阴之兰亭，修禊事也。群贤毕至，少长咸集。此地有崇山峻岭，茂林修竹，又有清流激湍，映带左右，引以为流觞曲水，列坐其次。虽无丝竹管弦之盛，一觞一咏，亦足以畅叙幽情。"
+    typing="{{ { step: 2, interval: 50 } }}"
+    onTypingComplete="onTypingComplete"
+  >
+    <ant-actions
+      a:if="{{ loaded }}"
+      slot="footer"
+      items="{{bubbleActions}}"
+      onItemTap="handleBubbleAction"
+    />
   </ant-bubble>
 </ant-container>

copilot-demo/pages/Actions/index.ts

@@ -34,6 +34,10 @@ Page({
   },
 
   handleTapAction(item) {
+    /// #if WECHAT
+    // @ts-ignore
+    item = item.detail;
+    /// #endif
     const basicActions = [...this.data.basicActions];
     if (item.label === 'like') {
       this.setData({
@@ -43,18 +47,38 @@ Page({
         ? 'https://mdn.alipayobjects.com/huamei_bsws4g/afts/img/JmVoRp-2UwMAAAAAAAAAAAAADoEQAQFr/original'
         : 'LikeOutline';
     } else {
+      /// #if ALIPAY
       my.showToast({
         content: `${item.label} tapped`,
       });
+      /// #endif
+      /// #if WECHAT
+      // @ts-ignore
+      wx.showToast({
+        title: `${item.label} tapped`,
+      });
+      /// #endif
     }
     this.setData({
       basicActions,
     });
   },
   handleBubbleAction(item) {
+    /// #if WECHAT
+    // @ts-ignore
+    item = item.detail;
+    /// #endif
+    /// #if ALIPAY
     my.showToast({
       content: `${item.label} tapped`,
     });
+    /// #endif
+    /// #if WECHAT
+    // @ts-ignore
+    wx.showToast({
+      title: `${item.label} tapped`,
+    });
+    /// #endif
   },
   onTypingComplete() {
     this.setData({

copilot-demo/pages/Sender/index.ts

@@ -21,13 +21,21 @@ Page({
   },
   /** 基础用法  */
   handleChange(value: string) {
+    /// #if WECHAT
+    // @ts-ignore
+    value = value.detail;
+    /// #endif
     this.setData({ value });
   },
   handleSend() {
     this.setData({ value: '' });
   },
   /** 发送loading状态  */
   handleChange1(value: string) {
+    /// #if WECHAT
+    // @ts-ignore
+    value = value.detail;
+    /// #endif
     this.setData({ value1: value });
   },
   handleSend1() {
@@ -42,6 +50,10 @@ Page({
   },
   /** 配合upload组件 */
   handleChange3(value: string) {
+    /// #if WECHAT
+    // @ts-ignore
+    value = value.detail;
+    /// #endif
     this.setData({ value3: value });
   },
   handleSend3() {
@@ -56,6 +68,10 @@ Page({
     });
   },
   handleChange4(value: string) {
+    /// #if WECHAT
+    // @ts-ignore
+    value = value.detail;
+    /// #endif
     this.setData({ value4: value });
   },
   handleSend4() {

copilot-demo/pages/ThoughtChain/index.axml

@@ -33,4 +33,4 @@
       <view a:else>{{module.content}}</view>
     </view>
   </thought-chain>
-</ant-container>
+</ant-container>

copilot/Actions/check.sjs

@@ -1,3 +1,13 @@
+/// #if ALIPAY
 export function checkIcon(icon = '') {
   return getRegExp('^[a-zA-Z]+$').test(icon);
 }
+/// #endif
+/// #if WECHAT
+function checkIcon(icon = '') {
+  return getRegExp('^[a-zA-Z]+$').test(icon);
+}
+module.exports = {
+  checkIcon
+}
+/// #endif

copilot/Actions/index.axml

@@ -1,4 +1,4 @@
-<import-sjs from="./check.sjs" name="{ checkIcon }" />
+<import-sjs from="./check.sjs" name="sjs" />
 
 <view class="ant-copilot-actions {{className}}" style="{{style}}">
   <view
@@ -9,7 +9,7 @@
     data-action="{{item}}"
   >
     <ant-icon
-      a:if="{{checkIcon(item.icon)}}"
+      a:if="{{sjs.checkIcon(item.icon)}}"
       className="ant-copilot-actions-item-icon"
       type="{{item.icon}}"
     />

copilot/Bubble/index.ts

@@ -1,25 +1,30 @@
-import { Component } from '../../src/_util/simply';
+import { Component, getValueFromProps, triggerEventOnly } from '../../src/_util/simply';
 import { BubbleProps } from './props';
 
 Component(
   BubbleProps,
   {
     startTyping() {
-      if (this.props.loading) {
+      const [loading, typing, content] = getValueFromProps(this, [
+        'loading',
+        'typing',
+        'content',
+      ]);
+      if (loading) {
         return;
       }
-      if (this.props.content) {
-        const typingOptions = this.props.typing
-          ? this.props.typing === true
+      if (content) {
+        const typingOptions = typing
+          ? typing === true
             ? { step: 1, interval: 100 }
-            : this.props.typing
+            : typing
           : false;
         if (typingOptions) {
           const { step = 1, interval = 100 } = typingOptions;
-          const content = this.props.content;
+          const bubbleText = content;
           // todo 待优化
           const typingLoop = (length: number, typedLength: number) => {
-            const typingText = content.slice(0, typedLength);
+            const typingText = bubbleText.slice(0, typedLength);
             this.setData({
               bubbleText: typingText,
             });
@@ -28,15 +33,15 @@ Component(
                 typingLoop(length, typedLength + step);
               }, interval);
             } else {
-              this.props.onTypingComplete?.();
+              triggerEventOnly(this, 'typingComplete')
             }
           };
-          typingLoop(content.length, step);
+          typingLoop(bubbleText.length, step);
         } else {
           this.setData({
-            bubbleText: this.props.content,
+            bubbleText: content,
           });
-          this.props.onTypingComplete?.();
+          triggerEventOnly(this, 'typingComplete')
         }
       }
     },
@@ -58,8 +63,15 @@ Component(
         }
       },
     },
+/// #if ALIPAY
     didMount() {
       this.startTyping();
     },
+/// #endif
+/// #if WECHAT
+    attached() {
+      this.startTyping();
+    },
+/// #endif
   }
 );

copilot/Bubble/props.ts

@@ -45,7 +45,6 @@ export const BubbleProps: IBubbleProps = {
   placement: 'start',
   loading: false,
   typing: false,
-  onTypingComplete: () => {},
   shape: 'default',
   variant: 'filled',
   avatar: '',

copilot/Sender/index.less

@@ -30,6 +30,7 @@
         box-sizing: border-box;
         overflow: hidden;
         .ant-copilot-sender-input {
+          width: 100%;
           margin-left: @size-1;
           padding: 0;
           font-size: 30rpx;

copilot/Sender/index.ts

@@ -1,16 +1,18 @@
-import { Component, triggerEvent, triggerEventOnly } from '../../src/_util/simply';
+import { Component, getValueFromProps, triggerEvent, triggerEventOnly } from '../../src/_util/simply';
 import { SenderProps } from './props';
 
 Component(SenderProps, {
   handleMainBtn() {
-    if (this.props.loading) {
+    const [ loading ] = getValueFromProps(this, ['loading']);
+    if (loading) {
       this.handleCancel();
     } else {
       this.handleSubmit();
     }
   },
   handleSubmit() {
-    triggerEvent(this, 'submit', this.props.value);
+    const [ value ] = getValueFromProps(this, ['value']);
+    triggerEvent(this, 'submit', value);
   },
   handleCancel() {
     triggerEventOnly(this, 'cancel');

copilot/Sender/props.ts

@@ -38,6 +38,7 @@ export const SenderProps: ISenderProps = {
   value: '',
   placeholder: '可以问我任何问题~',
   disabled: false,
+  loading: false,
 };
 
 export type { ISenderProps };

scripts/axml/mapping.ts

@@ -209,4 +209,15 @@ export const wechatCustomMapping = {
   'ant-empty': {
     onClickButton: 'bindclickbutton',
   },
+  'ant-actions': {
+    onItemTap: 'binditemtap',
+  },
+  'ant-bubble': {
+    onTypingComplete: 'bindtypingcomplete',
+  },
+  'ant-sender': {
+    onChange: 'bindchange',
+    onSubmit: 'bindsubmit',
+    onCancel: 'bindcancel',
+  },
 };