fix: merge

compiled/alipay/demo/pages/Form/FormCustom/checklist/index.sjs

@@ -1,11 +1,11 @@
 function getTitle(options, value) {
-  var obj = options.find(function (item) {
-    return item.value === value;
-  });
+  const obj = options.find(item => item.value === value);
   if (obj) {
     return obj.title;
   }
 }
-export default {
+
+export default { getTitle };
+ default {
   getTitle: getTitle
 };

compiled/alipay/src/Card/index.axml

@@ -30,18 +30,18 @@
           onTap="handleTapLink"
         >
           {{operateText}}
-          <icon type="RightOutline"></icon>
+          <ant-icon type="RightOutline"></ant-icon>
         </view>
         <view
           a:elif="{{needFold}}"
           class="ant-card-header-right-link"
           onTap="handleTapFoldBtn"
         >
           <text class="ant-card-header-fold-btn">{{finalFoldStatus ? '展开' : '收起'}}</text>
-          <icon
+          <ant-icon
             class="ant-card-header-fold-icon"
             type="{{finalFoldStatus ? 'DownOutline' : 'UpOutline'}}"
-          ></icon>
+          ></ant-icon>
         </view>
       </slot>
     </view>

compiled/alipay/src/Card/index.json

@@ -2,6 +2,6 @@
   "component": true,
   "usingComponents": {
     "sticky": "../Sticky/index",
-    "icon": "../Icon/index"
+    "ant-icon": "../Icon/index"
   }
 }

compiled/alipay/src/Checklist/ChecklistItem/index.json

@@ -1,6 +1,3 @@
 {
-  "component": true,
-  "usingComponents": {
-    "icon": "../../Icon/index"
-  }
+  "component": true
 }

compiled/alipay/src/DatePicker/RangePicker/index.axml

@@ -16,11 +16,11 @@
     >
       {{placeholder}}
     </view>
-    <icon
+    <ant-icon
       a:if="{{precision === 'year' || precision === 'month' || precision === 'day' || precision === 'hour'}}"
       type="CalendarOutline"
       className="ant-range-picker-selector-item-icon"
-    ></icon>
+    ></ant-icon>
   </view>
 </template>
 <ant-picker
@@ -53,12 +53,12 @@
   >
     <template
       is="selector"
-      data="{{ placeholder: startPlaceholder === null ? locale.RangePicker.startPlaceholder : startPlaceholder, active: pickerType === 'start', type: 'start', value: currentStartValueStr, precision: precision }}"
+      data="{{ placeholder: [undefined, null].indexOf(startPlaceholder) !== -1 ? locale.RangePicker.startPlaceholder : startPlaceholder, active: pickerType === 'start', type: 'start', value: currentStartValueStr, precision: precision }}"
     ></template>
     <view class="ant-range-picker-selector-split">{{splitCharacter}}</view>
     <template
       is="selector"
-      data="{{ placeholder: endPlaceholder === null ? locale.RangePicker.endPlaceholder : endPlaceholder, active: pickerType === 'end', type: 'end', value: currentEndValueStr, precision: precision }}"
+      data="{{ placeholder: [undefined, null].indexOf(endPlaceholder) !== -1 ? locale.RangePicker.endPlaceholder : endPlaceholder, active: pickerType === 'end', type: 'end', value: currentEndValueStr, precision: precision }}"
     ></template>
   </view>
   <slot

compiled/alipay/src/DatePicker/RangePicker/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "icon": "../../Icon/index",
+    "ant-icon": "../../Icon/index",
     "ant-picker": "../../Picker/index"
   }
 }

compiled/alipay/src/Form/FormCascaderPicker/index.axml

@@ -18,9 +18,9 @@
   <view>
     <ant-cascader-picker
       options="{{options}}"
-      cancelText="{{cancelText === null ? locale.global.cancelText : cancelText}}"
-      okText="{{okText === null ? locale.global.okText : okText}}"
-      placeholder="{{placeholder === null ? locale.global.placeholder : placeholder}}"
+      cancelText="{{[undefined, null].indexOf(cancelText) !== -1 ? locale.global.cancelText : cancelText}}"
+      okText="{{[undefined, null].indexOf(okText) !== -1 ? locale.global.okText : okText}}"
+      placeholder="{{[undefined, null].indexOf(placeholder) !== -1 ? locale.global.placeholder : placeholder}}"
       animationType="{{animationType}}"
       maskClosable="{{maskClosable}}"
       maskStyle="{{maskStyle}}"

compiled/alipay/src/Form/FormDatePicker/index.axml

@@ -21,9 +21,9 @@
       max="{{max}}"
       format="{{format}}"
       precision="{{precision}}"
-      cancelText="{{cancelText === null ? locale.global.cancelText : cancelText}}"
-      okText="{{okText === null ? locale.global.okText : okText}}"
-      placeholder="{{placeholder === null ? locale.global.placeholder : placeholder}}"
+      cancelText="{{[undefined, null].indexOf(cancelText) !== -1 ? locale.global.cancelText : cancelText}}"
+      okText="{{[undefined, null].indexOf(okText) !== -1 ? locale.global.okText : okText}}"
+      placeholder="{{[undefined, null].indexOf(placeholder) !== -1 ? locale.global.placeholder : placeholder}}"
       animationType="{{animationType}}"
       maskClosable="{{maskClosable}}"
       maskStyle="{{maskStyle}}"

compiled/alipay/src/Form/FormPicker/index.axml

@@ -17,9 +17,9 @@
 >
   <view>
     <ant-picker
-      cancelText="{{cancelText === null ? locale.global.cancelText : cancelText}}"
-      okText="{{okText === null ? locale.global.okText : okText}}"
-      placeholder="{{placeholder === null ? locale.global.placeholder : placeholder}}"
+      cancelText="{{[undefined, null].indexOf(cancelText) !== -1 ? locale.global.cancelText : cancelText}}"
+      okText="{{[undefined, null].indexOf(okText) !== -1 ? locale.global.okText : okText}}"
+      placeholder="{{[undefined, null].indexOf(placeholder) !== -1 ? locale.global.placeholder : placeholder}}"
       maskClosable="{{maskClosable}}"
       maskStyle="{{maskStyle}}"
       popClassName="{{popClassName}}"

compiled/alipay/src/Form/FormRangePicker/index.axml

@@ -17,17 +17,17 @@
 >
   <view>
     <ant-range-picker
-      endPlaceholder="{{cancelText === null ? locale.rangePicker.endPlaceholder : cancelText}}"
-      startPlaceholder="{{cancelText === null ? locale.rangePicker.startPlaceholder : cancelText}}"
+      endPlaceholder="{{[undefined, null].indexOf(cancelText) !== -1 ? locale.rangePicker.endPlaceholder : cancelText}}"
+      startPlaceholder="{{[undefined, null].indexOf(cancelText) !== -1 ? locale.rangePicker.startPlaceholder : cancelText}}"
       splitCharacter="{{splitCharacter}}"
       min="{{min}}"
       max="{{max}}"
       format="{{format}}"
       precision="{{precision}}"
       animationType="{{animationType}}"
-      cancelText="{{cancelText === null ? locale.global.cancelText : cancelText}}"
-      okText="{{okText === null ? locale.global.okText : okText}}"
-      placeholder="{{placeholder === null ? locale.global.placeholder : placeholder}}"
+      cancelText="{{[undefined, null].indexOf(cancelText) !== -1 ? locale.global.cancelText : cancelText}}"
+      okText="{{[undefined, null].indexOf(okText) !== -1 ? locale.global.okText : okText}}"
+      placeholder="{{[undefined, null].indexOf(placeholder) !== -1 ? locale.global.placeholder : placeholder}}"
       maskClosable="{{maskClosable}}"
       maskStyle="{{maskStyle}}"
       popClassName="{{popClassName}}"

compiled/alipay/src/Form/FormRate/index.axml

@@ -27,7 +27,7 @@
   >
     <view slot="character">
       <slot name="character">
-        <icon type="StarFill"></icon>
+        <ant-icon type="StarFill"></ant-icon>
       </slot>
     </view>
   </rate>

compiled/alipay/src/Form/FormRate/index.json

@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "form-item": "../FormItem/index",
-    "icon": "../../Icon/index",
+    "ant-icon": "../../Icon/index",
     "rate": "../../Rate/index"
   }
 }

compiled/alipay/src/Form/FormTextarea/index.axml

@@ -16,7 +16,7 @@
     allowClear="{{allowClear}}"
     enableNative="{{enableNative}}"
     disabled="{{disabled}}"
-    placeholder="{{placeholder === null ? locale.global.placeholder : placeholder}}"
+    placeholder="{{[undefined, null].indexOf(placeholder) !== -1 ? locale.global.placeholder : placeholder}}"
     placeholderClassName="{{placeholderClassName}}"
     placeholderStyle="{{placeholderStyle}}"
     maxLength="{{maxLength}}"

compiled/alipay/src/GuideTour/index.axml

@@ -24,7 +24,7 @@
       size="small"
       onTap="onCancel"
     >
-      {{jumpText === null ? locale.guideTour.jumpText : jumpText}}
+      {{[undefined, null].indexOf(jumpText) !== -1 ? locale.guideTour.jumpText : jumpText}}
     </ant-button>
     <ant-button
       a:if="{{utils.checkShowPrev(mixin.value, items)}}"
@@ -33,7 +33,7 @@
       onTap="onPrev"
       data-currentValue="{{mixin.value}}"
     >
-      {{prevStepText === null ? locale.guideTour.prevStepText : prevStepText}}
+      {{[undefined, null].indexOf(prevStepText) !== -1 ? locale.guideTour.prevStepText : prevStepText}}
     </ant-button>
     <ant-button
       a:if="{{utils.checkShowNext(mixin.value, items)}}"
@@ -42,15 +42,15 @@
       onTap="onNext"
       data-currentValue="{{mixin.value}}"
     >
-      {{nextStepText === null ? locale.guideTour.nextStepText : nextStepText}}
+      {{[undefined, null].indexOf(nextStepText) !== -1 ? locale.guideTour.nextStepText : nextStepText}}
     </ant-button>
     <ant-button
       a:if="{{utils.checkShowKnow(mixin.value, items)}}"
       inline
       size="small"
       onTap="onCancel"
     >
-      {{gotItText === null ? locale.guideTour.gotItText : gotItText}}
+      {{[undefined, null].indexOf(gotItText) !== -1 ? locale.guideTour.gotItText : gotItText}}
     </ant-button>
   </view>
   <block a:if="{{swiperable}}">

compiled/alipay/src/Icon/index.less

@@ -13,9 +13,8 @@
   font-family: antdmini-icon !important;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
-  line-height: @line-height-base;
   color: @icon-color;
-
+  line-height: @line-height-base;
 
   &-MinusOutline:before {
     content: '\e66f';

compiled/alipay/src/ImageIcon/index.axml

@@ -3,12 +3,12 @@
   name="helper"
 ></import-sjs>
 <view class="ant-imageIcon {{className ? className : ''}}">
-  <icon
+  <ant-icon
     a:if="{{helper.isIcon(image)}}"
     type="{{image}}"
     className="{{className ? className + '-icon' : ''}}"
     style="{{style}}"
-  ></icon>
+  ></ant-icon>
   <image
     a:else
     src="{{image}}"

compiled/alipay/src/ImageIcon/index.json

@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "icon": "../Icon/index"
+    "ant-icon": "../Icon/index"
   }
 }

compiled/alipay/src/ImageUpload/index.axml

@@ -33,19 +33,19 @@
               <loading className="ant-image-upload-cover-loading-icon"></loading>
               <view class="ant-image-upload-cover-loading-text">
 
-                {{uploadingText === null ? locale.imageUpload.uploadingText : uploadingText}}
+                {{[undefined, null].indexOf(uploadingText) !== -1 ? locale.imageUpload.uploadingText : uploadingText}}
               </view>
             </view>
             <view
               a:if="{{item.status === 'error'}}"
               class="ant-image-upload-cover-error"
             >
-              <icon
+              <ant-icon
                 className="ant-image-upload-cover-error-icon"
                 type="CloseCircleOutline"
-              ></icon>
+              ></ant-icon>
               <view class="ant-image-upload-cover-error-text">
-                {{uploadfailedText === null ? locale.imageUpload.uploadfailedText : uploadfailedText}}
+                {{[undefined, null].indexOf(uploadfailedText) !== -1 ? locale.imageUpload.uploadfailedText : uploadfailedText}}
               </view>
             </view>
           </view>
@@ -65,10 +65,10 @@
           a:if="{{showUploadButton}}"
           class="ant-image-upload-add-image-wrapper"
         >
-          <icon
+          <ant-icon
             type="AddOutline"
             className="ant-image-upload-add-image-icon"
-          ></icon>
+          ></ant-icon>
         </view>
       </slot>
     </view>

compiled/alipay/src/ImageUpload/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "icon": "../Icon/index",
+    "ant-icon": "../Icon/index",
     "loading": "../Loading/index"
   }
-}
+}

compiled/alipay/src/Input/InputBlur/index.axml

@@ -7,7 +7,7 @@
   value="{{state.value}}"
   type="{{type}}"
   password="{{password}}"
-  placeholder="{{placeholder === null ? locale.global.placeholder : placeholder}}"
+  placeholder="{{placeholder}}"
   placeholderClass="ant-input-item-placeholder-base {{placeholderClassName ? placeholderClassName : ''}}"
   placeholderStyle="{{placeholderStyle ? placeholderStyle : ''}}"
   maxlength="{{maxLength}}"

compiled/alipay/src/Input/InputBlur/index.ts

@@ -1,16 +1,9 @@
-import { effect } from '@preact/signals-core';
 import mixinValue from '../../mixins/value';
-import { ComponentWithSignalStoreImpl, triggerEvent } from '../../_util/simply';
-import i18nController from '../../_util/store';
+import { Component, triggerEvent } from '../../_util/simply';
+import { InputBlurDefaultProps } from './props';
 
-ComponentWithSignalStoreImpl(
-  {
-    store: () => i18nController,
-    updateHook: effect,
-    mapState: {
-      locale: ({ store }) => store.currentLocale.value,
-    },
-  },
+Component(
+  InputBlurDefaultProps,
   {
     onChange(e) {
       const value = e.detail.value;

compiled/alipay/src/Input/Textarea/index.axml

@@ -9,7 +9,7 @@
       class="ant-textarea-content {{allowClear ? 'ant-textarea-content-clear' : ''}}"
       disabled="{{disabled}}"
       value="{{state.value || ''}}"
-      placeholder="{{placeholder === null ? locale.global.placeholder : placeholder}}"
+      placeholder="{{[undefined, null].indexOf(placeholder) !== -1 ? locale.global.placeholder : placeholder}}"
       placeholderClass="ant-textarea-placeholder {{placeholderClassName ? placeholderClassName : ''}}"
       placeholderStyle="{{placeholderStyle ? placeholderStyle : ''}}"
       maxlength="{{maxLength}}"
@@ -29,10 +29,10 @@
       class="ant-textarea-clear {{state.value && state.value.length > 0 ? 'ant-textarea-clear-show' : 'ant-textarea-clear-hidden'}}"
       onTap="onClear"
     >
-      <icon
+      <ant-icon
         className="ant-textarea-clear-icon"
         type="CloseCircleFill"
-      ></icon>
+      ></ant-icon>
     </view>
   </view>
 </view>

compiled/alipay/src/Input/Textarea/index.json

@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "icon": "../../Icon/index"
+    "ant-icon": "../../Icon/index"
   }
 }

compiled/alipay/src/Input/index.axml

@@ -15,7 +15,7 @@
       type="{{type}}"
       adjustPosition="{{adjustPosition}}"
       password="{{password}}"
-      placeholder="{{placeholder === null ? locale.global.placeholder : placeholder}}"
+      placeholder="{{[undefined, null].indexOf(placeholder) !== -1 ? locale.global.placeholder : placeholder}}"
       placeholderClass="ant-input-placeholder {{placeholderClassName ? placeholderClassName : ''}}"
       placeholderStyle="{{placeholderStyle ? placeholderStyle : ''}}"
       maxlength="{{maxLength}}"
@@ -38,10 +38,10 @@
       class="ant-input-clear {{state.value && state.value.length > 0 ? 'ant-input-clear-show' : 'ant-input-clear-hidden'}}"
       onTap="onClear"
     >
-      <icon
+      <ant-icon
         className="ant-input-clear-icon"
         type="CloseCircleFill"
-      ></icon>
+      ></ant-icon>
     </view>
   </view>
   <view class="ant-input-suffix">

compiled/alipay/src/Input/index.json

@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "icon": "../Icon/index"
+    "ant-icon": "../Icon/index"
   }
 }