@cloudbase/weda-ui-mp 3.15.1 → 3.15.3

package/components/chart/ec-canvas/ec-canvas.js

@@ -143,34 +143,36 @@ Component({
         .select(`#${this.data.canvasId}`)
         .fields({ node: true, size: true })
         .exec(async (res) => {
-          const canvasNode = res[0].node;
-          this.canvasNode = canvasNode;
+          const canvasNode = res[0]?.node;
+          if (canvasNode) {
+            this.canvasNode = canvasNode;
 
-          const canvasDpr = wx.getSystemInfoSync().pixelRatio;
-          const canvasWidth = res[0].width;
-          const canvasHeight = res[0].height;
+            const canvasDpr = wx.getSystemInfoSync().pixelRatio;
+            const canvasWidth = res[0].width;
+            const canvasHeight = res[0].height;
 
-          const ctx = canvasNode.getContext('2d');
+            const ctx = canvasNode.getContext('2d');
 
-          const canvas = new WxCanvas(ctx, this.data.canvasId, true, canvasNode);
-          echarts.setCanvasCreator(() => {
-            return canvas;
-          });
-
-          if (typeof callback === 'function') {
-            this.chart = callback(canvas, canvasWidth, canvasHeight, canvasDpr);
-          } else if (this.data.ec && typeof this.data.ec.onInit === 'function') {
-            this.chart = await this.data.ec.onInit(canvas, canvasWidth, canvasHeight, canvasDpr);
-          } else {
-            this.triggerEvent('init', {
-              canvas: canvas,
-              width: canvasWidth,
-              height: canvasHeight,
-              dpr: canvasDpr,
+            const canvas = new WxCanvas(ctx, this.data.canvasId, true, canvasNode);
+            echarts.setCanvasCreator(() => {
+              return canvas;
             });
-          }
 
-          this.domObserver && this.domObserver.disconnect();
+            if (typeof callback === 'function') {
+              this.chart = callback(canvas, canvasWidth, canvasHeight, canvasDpr);
+            } else if (this.data.ec && typeof this.data.ec.onInit === 'function') {
+              this.chart = await this.data.ec.onInit(canvas, canvasWidth, canvasHeight, canvasDpr);
+            } else {
+              this.triggerEvent('init', {
+                canvas: canvas,
+                width: canvasWidth,
+                height: canvasHeight,
+                dpr: canvasDpr,
+              });
+            }
+
+            this.domObserver && this.domObserver.disconnect();
+          }
         });
     },
     canvasToTempFilePath(opt) {

package/components/form/select/dropdown-select/index.js

@@ -127,7 +127,7 @@ Component({
           });
         }
         this.triggerEvent('search', { value });
-      }, 1000);
+      }, 300);
       this.setData({
         timeId,
       });

package/components/form/selectMultiple/dropdown-select/index.js

@@ -181,12 +181,7 @@ Component({
   observers: {
     'option,searchValue,staticSearchable': function (option, searchValue, staticSearchable) {
       const { ignoreCase } = this.properties;
-      if (searchValue === '') {
-        this.setData({
-          showOption: option,
-          status: option.length > 0 ? 0 : 3,
-        });
-      } else if (staticSearchable) {
+      if (staticSearchable) {
         const searchRange = option.filter((item) => {
           if (ignoreCase) {
             return String(item.label).toLowerCase().indexOf(searchValue.toLowerCase()) !== -1;

package/components/form/selectMultiple/index.js

@@ -94,10 +94,6 @@ Component({
       type: Boolean,
       value: true,
     },
-    staticSearchable: {
-      type: Boolean,
-      value: true,
-    },
     where: {
       type: Array,
       value: [],
@@ -120,6 +116,7 @@ Component({
     whereEffected: [], // 每次请求都加上
     fetchTimed: null, // 防抖
     queryParam: { select: { $master: true } },
+    staticSearchable: true,
   },
   lifetimes: {
     attached() {
@@ -143,7 +140,6 @@ Component({
       // 默认
       this.setData({
         option: range,
-        loadStatus: range.length > 0 ? 0 : -1,
         value: this.properties.defaultValue,
         cls,
         subCls,
@@ -175,6 +171,11 @@ Component({
         value: this.properties.defaultValue,
       });
     },
+    format: function (format) {
+      this.setData({
+        staticSearchable: !['many-many', 'one-many'].includes(format),
+      });
+    },
     'value,range': function () {
       const { range, format } = this.properties;
       if (format !== 'one-many' && format !== 'many-many') {
@@ -187,6 +188,7 @@ Component({
       this.setData({
         option: checkRange,
         displayLabel: label,
+        loadStatus: range.length > 0 ? 0 : -1,
       });
     },
     dataSourceName: function () {
@@ -259,7 +261,7 @@ Component({
       // eslint-disable-next-line rulesdir/no-timer
       this.data.fetchTimed = setTimeout(() => {
         const { format, dataSourceName, primaryField } = this.properties;
-        if (['many-many', 'one-many'].concat(format) && dataSourceName && primaryField) {
+        if (['many-many', 'one-many'].includes(format) && dataSourceName && primaryField) {
           this.setData({ records: [], option: [], pageNo: 1 });
           this._fetchData({ searchValue, _init: true });
         }
@@ -270,6 +272,7 @@ Component({
     _fetchData: async function ({ queryParam = this.data.queryParam, searchValue = '', pageNo = 1, _init = false }) {
       const { dataSourceName, primaryField } = this.properties;
       if (!dataSourceName) return;
+      this.setData({ loadStatus: 1 });
       //   默认筛选条件
       let _filter = destr(this.data.queryParam.filter) ?? {};
       // 根据搜索值查询
@@ -304,9 +307,9 @@ Component({
       finalRecords = this.getUniqueOption(finalRecords);
       const { value } = this.data;
 
-      const unchecked = value.filter((i) => !finalRecords.find((j) => i === j.value));
+      const unchecked = value?.filter((i) => !finalRecords.find((j) => i === j.value));
       // 跨页勾选回显示
-      if (unchecked.length) {
+      if (unchecked?.length) {
         const uncheckedItem = await this.fetchItem(unchecked);
         uncheckedItem?.forEach((i) => {
           if (i) {

package/components/form/uploaderFile/index.js

@@ -251,7 +251,8 @@ Component({
       };
       const uploadPath = 'weda-uploader';
       const _uploadPath = await getDefaultUploadPath(uploadPath);
-      const cloudPath = `${_uploadPath}/${randomStr()}-${tempFile.name}`;
+      const filenameRegex = /[^a-zA-Z0-9\u4e00-\u9fff-*!_.]/g;
+      const cloudPath = `${_uploadPath}/${randomStr()}-${tempFile.name?.replace(filenameRegex, '-')}`;
       try {
         const tcb = await getCloudInstance();
         const uploadTask = await tcb.uploadFile({

package/components/listView/index.js

@@ -5,6 +5,7 @@ import { commonCompBehavior } from '../../utils/common-behavior';
 import { callDataSource } from '../../utils/tcb';
 import isEqual from '../../utils/deepEqual';
 import { textToString } from '../../utils/platform';
+import { deepClone } from '../../utils/lodash';
 
 import { WdCompError } from '../../utils/error';
 const LISTVIEW_MESSAGE = {
@@ -175,6 +176,7 @@ Component({
       },
     },
     paramRef: [],
+    preDataSourceCache: [],
   },
   methods: {
     // 数据列表设置表达式: 区分前后端分页
@@ -185,7 +187,7 @@ Component({
       let total = 0;
       if (Array.isArray(dataSourceData)) {
         if (enableTotal) {
-          records = dataSourceData;
+          records = deepClone(dataSourceData);
           total = !isNaN(parseInt(`${_total}`)) ? _total : 0;
         } else {
           const count = pageSize * pageNo;
@@ -603,7 +605,10 @@ Component({
           });
         }, 500);
       },
-    'dataSourceType,dataSourceData,total,enableTotal': function () {
+    'dataSourceType,dataSourceData,total,enableTotal': function (...rest) {
+      if (isEqual(this.data.preDataSourceCache, rest)) return;
+
+      this.setData({ preDataSourceCache: rest });
       if (this.properties.dataSourceType === 'expression') {
         // console.log('====dataSourceData====', this.data.dataSourceData);
         this.setExpression();

package/components/wd-form-arr/index.js

@@ -16,8 +16,7 @@ import equal from '../../utils/deepEqual';
  * @param currentName 当前表单项名称
  * @returns
  */
-const getValueName = (operateName, currentName) =>
-  operateName.replace(new RegExp(`^${currentName}(\\.)?`), '');
+const getValueName = (operateName, currentName) => operateName.replace(new RegExp(`^${currentName}(\\.)?`), '');
 
 Component({
   options: { virtualHost: true },
@@ -64,10 +63,7 @@ Component({
           that.change({ type: 'add' }, { isUpdateParentForm: false });
         },
         remove({ index = -1 } = {}) {
-          that.change(
-            { type: 'remove', value: index },
-            { isUpdateParentForm: false }
-          );
+          that.change({ type: 'remove', value: index }, { isUpdateParentForm: false });
         },
         change(params) {
           that.change(params, { isUpdateParentForm: true });
@@ -100,14 +96,10 @@ Component({
          * @returns
          */
         addFormItem(childName, formItem) {
-          if (
-            isNil(childName) ||
-            !formItem ||
-            (typeof childName === 'string' && childName.length === 0)
-          ) {
+          if (isNil(childName) || !formItem || (typeof childName === 'string' && childName.length === 0)) {
             // childName 没设置或为空串的时候不受表单容器控制
             console.warn(
-              `组件 #${formItem?.id} 表单key(表单输入类组件 childName 属性)没设置或为空串的时候不受表单容器控制`
+              `组件 #${formItem?.id} 表单key(表单输入类组件 childName 属性)没设置或为空串的时候不受表单容器控制`,
             );
             return noop;
           }
@@ -119,9 +111,7 @@ Component({
           }
           that.setData({ formsItemMap });
           return () => {
-            const removedArr = formsItemMap[childName].filter(
-              (item) => item !== formItem
-            );
+            const removedArr = formsItemMap[childName].filter((item) => item !== formItem);
             if (removedArr.length <= 0) {
               delete formsItemMap[childName];
             } else {
@@ -144,8 +134,7 @@ Component({
       });
     },
     updateWidgetAPI(apis = {}) {
-      const { name, objValue, label, visible, readOnly, disabled, status } =
-        this.data;
+      const { name, objValue, label, visible, readOnly, disabled, status } = this.data;
       this.setReadonlyAttributes?.({
         ...apis,
         label,
@@ -163,16 +152,12 @@ Component({
     },
     // 父级普通表单对象
     getParentForm() {
-      const parent = this?.$widget?.closest(
-        (w) => w.getConfig?.().componentType === 'form'
-      );
+      const parent = this?.$widget?.closest((w) => w.getConfig?.().componentType === 'form');
       return parent;
     },
     // 父级嵌套表单对象
     getParentFormObj() {
-      const parent = this?.$widget?.closest(
-        (w) => w.getConfig?.().componentType === 'formObj'
-      );
+      const parent = this?.$widget?.closest((w) => w.getConfig?.().componentType === 'formObj');
       return parent;
     },
     /**
@@ -192,10 +177,7 @@ Component({
         if (!Array.isArray(items)) {
           items = [items];
         }
-        const newValue = lodashGet(
-          value,
-          getValueName(childName, this.data.name)
-        );
+        const newValue = lodashGet(value, getValueName(childName, this.data.name));
         items.forEach((item) => {
           if (item?.setValue && !equal(item.value, newValue)) {
             item.setValue(newValue);
@@ -226,10 +208,7 @@ Component({
       }
       return value;
     },
-    change(
-      params,
-      { isUpdateParentForm = false, isUpdateChildValue = true } = {}
-    ) {
+    change(params, { isUpdateParentForm = false, isUpdateChildValue = true } = {}) {
       const { objValue, name, addDefaultValue } = this.data;
       let value = deepClone(params.value);
 
@@ -244,10 +223,7 @@ Component({
         // 触发删除操作，则删除对应索引的值
         if (params.type === 'remove') {
           value = deepClone(objValue);
-          value = [
-            ...value.slice(0, params.value),
-            ...value.slice(params.value + 1),
-          ];
+          value = [...value.slice(0, params.value), ...value.slice(params.value + 1)];
         }
       }
 
@@ -294,8 +270,6 @@ Component({
         // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
         parentFormObj?.__setValueImmediate__?.({ name, value });
       }
-
-      this.triggerOnDataChange(value);
     },
     /**
      * 子组件默认值变更，触发嵌套表单值更新
@@ -320,9 +294,7 @@ Component({
 
       if (params.name) {
         // 判断是否将当前的name前缀加上，以便父级嵌套表单更新值
-        const nameTemp = `${
-          !params.name.startsWith(name) && name ? `${name}.` : ''
-        }${params.name}`;
+        const nameTemp = `${!params.name.startsWith(name) && name ? `${name}.` : ''}${params.name}`;
         // 将值同步给父级嵌套表单
         parentFormObj?.__setValueImmediate__?.({
           name: nameTemp,
@@ -361,7 +333,7 @@ Component({
         this.change({ value }, { isUpdateParentForm: true });
       });
     },
-    objValue: function () {
+    objValue: function (value) {
       this.updateWidgetAPI();
       // 更新子组件的值需要主动去调用，不被动执行
       // 如果是最顶层的嵌套表单，则去更新子组件的值，否则自己的值更新不去触发子组件值更新，因为父级普通表单会去更新
@@ -369,6 +341,10 @@ Component({
       // if (!parentFormObj) {
       //   // this.updateChildValue(objValue);
       // }
+      const tempValue = this.getTempValue(value);
+      if (equal(tempValue, this.data.objValue)) {
+        this.triggerOnDataChange(value);
+      }
     },
   },
 });

package/components/wd-textarea/index.js

@@ -25,6 +25,7 @@ Component({
     counter: 0,
     placeholderCls: `${WD_PREFIX}-form-input-wrap__placeholder weui-input__placeholder`,
     _size: 'md',
+    _focus: false,
   },
   methods: {
     handleChange: function (e) {
@@ -32,17 +33,18 @@ Component({
       this.triggerEvent('change', e.detail);
     },
     handleFocus: function (e) {
+      this.setData({ _focus: true });
       this.triggerEvent('focus', e.detail);
     },
     handleBlur: function (e) {
+      this.setData({ _focus: false });
       this.triggerEvent('blur', e.detail);
     },
     handleConfirm: function (e) {
       this.triggerEvent('confirm', e.detail);
     },
     updateWidgetAPI: function () {
-      const { name, value, label, required, visible, disabled, readOnly } =
-        this.data;
+      const { name, value, label, required, visible, disabled, readOnly } = this.data;
       this.setReadonlyAttributes?.({
         name,
         value,
@@ -54,7 +56,7 @@ Component({
       });
     },
     init() {
-      const { disabled, size, classRoot } = this.data;
+      const { disabled, size, classRoot, _focus } = this.data;
       const { classPrefix } = this.data;
       const _size = convertSize(size);
       const root = `${classPrefix}-${classRoot}`;
@@ -70,14 +72,15 @@ Component({
           'size-width-hundred': true,
           'is-disabled': disabled,
           'textarea-restriction': true,
-        }
+          'is-focused': _focus,
+        },
       );
       const countCls = `${textareaWrap}__label ${root}-${classRoot}__count-text`;
       this.setData({ cls, countCls, _size });
     },
   },
   observers: {
-    'disabled,counterVisible,size,classRoot': function () {
+    'disabled,counterVisible,size,classRoot,_focus': function () {
       this.init();
     },
     value: function (value) {
@@ -87,6 +90,9 @@ Component({
     'name, value, label, required, visible, disabled, readOnly': function () {
       this.updateWidgetAPI();
     },
+    focus: function (focus) {
+      this.setData({ _focus: focus });
+    },
   },
   lifetimes: {
     attached: function () {

package/package.json

@@ -3,7 +3,7 @@
   "miniprogram": "./",
   "packageManager": "yarn@3.0.2",
   "dependencies": {},
-  "version": "3.15.1",
+  "version": "3.15.3",
   "main": "./",
   "publishConfig": {
     "access": "public"