@cloudbase/weda-ui-mp 3.14.4 → 3.15.0

package/components/chart/common/data-transform.js

@@ -2,10 +2,7 @@ import lodashSet from 'lodash.set';
 import { isNil } from '../../../utils/lodash';
 
 export const checkIsNewData = (props) => {
-  return (
-    Object.keys(props.dataSource ?? {}).length === 0 &&
-    Object.keys(props['dataModel'] ?? {}).length > 0
-  );
+  return Object.keys(props.dataSource ?? {}).length === 0 && Object.keys(props['dataModel'] ?? {}).length > 0;
 };
 
 export function transform(chartType, dataInput, chartInput) {
@@ -56,9 +53,7 @@ export function transform(chartType, dataInput, chartInput) {
 
   const finalDataInput = (dataInput ?? [])?.filter((item) => {
     if (!chartInput.xIsCountEmpty) {
-      return (
-        item.XLabel['Value'] !== undefined && item.XLabel['Value'] !== null
-      );
+      return item.XLabel['Value'] !== undefined && item.XLabel['Value'] !== null;
     }
 
     return true;
@@ -100,13 +95,9 @@ export function transform(chartType, dataInput, chartInput) {
         if (!series[idx]) {
           series[idx] = {
             type: chartType,
-            name:
-              chartType === 'pie'
-                ? undefined
-                : eachYaxis.Cn_Name ?? eachYaxis.Name,
+            name: chartType === 'pie' ? undefined : eachYaxis.Cn_Name ?? eachYaxis.Name,
             stack: chartInput.isPile ? 'pile' : undefined,
-            showSymbol:
-              chartType === 'pie' ? undefined : chartInput.isSeriesShowSymbol,
+            showSymbol: chartType === 'pie' ? undefined : chartInput.isSeriesShowSymbol,
             label: {
               show: chartInput.isSeriesShowSymbol, // 老逻辑这么来的
             },
@@ -166,8 +157,7 @@ export function transform(chartType, dataInput, chartInput) {
         type: chartType,
         name: groupName,
         stack: chartInput.isPile ? 'pile' : undefined,
-        showSymbol:
-          chartType === 'pie' ? undefined : chartInput.isSeriesShowSymbol,
+        showSymbol: chartType === 'pie' ? undefined : chartInput.isSeriesShowSymbol,
         label: {
           show: chartInput.isSeriesShowSymbol, // 老逻辑这么来的
         },
@@ -201,7 +191,7 @@ export function transform(chartType, dataInput, chartInput) {
     });
   }
 
-  console.log(dataInput, chartInput, 'TRANSFORM');
+  // console.log(dataInput, chartInput, 'TRANSFORM');
 
   if (chartType === 'bar' || chartType === 'line') {
     const xAxis = {

package/components/form/form/wd-form.wxss

@@ -1109,4 +1109,19 @@ textarea {
 }
 .wd-mp-form-item-obj .wd-form-item--weui.wd-form-item {
   width: 100%;
+}
+
+.wd-input-password-icon {
+  padding: 0 5px;
+  display: flex;
+  cursor: pointer;
+}
+
+.wd-pc-input-password-icon {
+  position: absolute;
+  right: -30px;
+}
+
+.password-input .wd-form-item-wrap__control-wrap {
+  position: relative;
 }

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

@@ -59,7 +59,7 @@ Component({
     searchValue: '',
     disabledIndex: -1, // 预留参数，暂时无用
     clickIndex: 0,
-    index: 0,
+    index: -1,
     status: 0,
     showOption: [],
     isFinish: false,
@@ -84,14 +84,7 @@ Component({
     bindinput: function (event) {
       const value = event.detail.value;
 
-      const {
-        option,
-        loadStatus,
-        isTurnPages,
-        _needFetch,
-        ignoreCase,
-        staticSearchable,
-      } = this.properties;
+      const { option, loadStatus, isTurnPages, _needFetch, ignoreCase, staticSearchable } = this.properties;
       if (value === '' || value === this.data.searchValue) {
         this.setData({
           searchValue: value,
@@ -124,9 +117,7 @@ Component({
 
           const searchOption = option.filter((item) => {
             if (ignoreCase) {
-              return String(item.label)
-                .toLowerCase()
-                .includes(value.toLowerCase());
+              return String(item.label).toLowerCase().includes(value.toLowerCase());
             }
             return item.label.includes(value);
           });
@@ -182,7 +173,7 @@ Component({
       }
       const { isFinish, searchValue, searchPageNo } = this.data;
       if (searchValue === '') {
-        if (this.properties.loadStatus === 1 && isFinish) {
+        if (isFinish) {
           this.setData({
             pageNo: this.properties.pageNo + 1,
             isFinish: false,
@@ -193,7 +184,7 @@ Component({
           });
         }
       } else {
-        if (this.properties.searchStatus === 1 && isFinish) {
+        if (isFinish) {
           this.setData({
             searchPageNo: this.data.searchPageNo + 1,
             isFinish: false,
@@ -234,54 +225,46 @@ Component({
     },
   },
   observers: {
-    'option, loadStatus, searchOption, searchStatus, _needFetch, staticSearchable':
-      function (
-        option,
-        loadStatus,
-        searchOption,
-        searchStatus,
-        _needFetch,
-        staticSearchable
-      ) {
-        if (this.data.searchValue === '') {
-          // 初始化会走到这
-          const { chooseIndexValue } = this.properties;
-          let index = -1;
-          if (chooseIndexValue !== '') {
-            index = option.findIndex((item) => item.value === chooseIndexValue);
-          } else {
-            option.some((item, i) => {
-              if (!item?.disabled) {
-                index = i;
-                return true;
-              }
-            });
-          }
+    'option, loadStatus, searchOption, searchStatus, _needFetch, staticSearchable': function (
+      option,
+      loadStatus,
+      searchOption,
+      searchStatus,
+      _needFetch,
+      staticSearchable,
+    ) {
+      if (this.data.searchValue === '') {
+        // 初始化会走到这
+        const { chooseIndexValue } = this.properties;
+        let index = -1;
+        if (chooseIndexValue !== '') {
+          index = option.findIndex((item) => item.value === chooseIndexValue);
+        }
+        this.setData({
+          status: loadStatus,
+          showOption: option,
+          isFinish: true,
+          index: index,
+          clickIndex: index,
+        });
+      } else {
+        if (_needFetch) {
+          // 只有needFetch 才设置searchOption
           this.setData({
-            status: loadStatus,
+            status: searchStatus,
+            showOption: searchOption,
+            isFinish: true,
+            index: -1,
+          });
+        } else if (!staticSearchable) {
+          this.setData({
+            status: searchStatus,
             showOption: option,
             isFinish: true,
-            index: index,
-            clickIndex: index,
+            index: -1,
           });
-        } else {
-          if (_needFetch) {
-            // 只有needFetch 才设置searchOption
-            this.setData({
-              status: searchStatus,
-              showOption: searchOption,
-              isFinish: true,
-              index: -1,
-            });
-          } else if (!staticSearchable) {
-            this.setData({
-              status: searchStatus,
-              showOption: option,
-              isFinish: true,
-              index: -1,
-            });
-          }
         }
-      },
+      }
+    },
   },
 });

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

@@ -26,7 +26,7 @@
             加载失败
             <text class="weda-ui-custom-picker__btn weda-ui-custom-picker__btn--link" bindtap="onRetry">重试</text>
           </view>
-          <view wx:if="{{status === 3}}" class="weda-ui-custom-picker__status"> 暂无数据 </view>
+          <view wx:if="{{status === 3&&!showOption.length}}" class="weda-ui-custom-picker__status"> 暂无数据 </view>
         </view>
       </view>
     </scroll-view>

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

@@ -280,8 +280,7 @@
   transform: translateX(0);
 }
 
-.weda-ui-custom-search.is-focused
-  .weda-ui-custom-search-box__search-placeholder {
+.weda-ui-custom-search.is-focused .weda-ui-custom-search-box__search-placeholder {
   display: none;
 }
 

package/components/form/select/index.js

@@ -592,7 +592,7 @@ Component({
         },
       });
       const results = data?.records;
-      console.log(results, param, 'Records');
+      // console.log(results, param, 'Records');
       if (isUpdate && results && results.length > 0) {
         this.setData({
           chooseIndexLable: results[0][this.properties.primaryField] || results[0]._id,

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

@@ -124,10 +124,7 @@ Component({
       const { selectedCache } = this.data;
       const index = selectedCache.findIndex((v) => v.value === item.value);
       if (index > -1) {
-        return [
-          ...selectedCache.slice(0, index),
-          ...selectedCache.slice(index + 1),
-        ];
+        return [...selectedCache.slice(0, index), ...selectedCache.slice(index + 1)];
       }
 
       return [...selectedCache, item];
@@ -182,11 +179,7 @@ Component({
     },
   },
   observers: {
-    'option,searchValue,staticSearchable': function (
-      option,
-      searchValue,
-      staticSearchable
-    ) {
+    'option,searchValue,staticSearchable': function (option, searchValue, staticSearchable) {
       const { ignoreCase } = this.properties;
       if (searchValue === '') {
         this.setData({
@@ -196,11 +189,7 @@ Component({
       } else if (staticSearchable) {
         const searchRange = option.filter((item) => {
           if (ignoreCase) {
-            return (
-              String(item.label)
-                .toLowerCase()
-                .indexOf(searchValue.toLowerCase()) !== -1
-            );
+            return String(item.label).toLowerCase().indexOf(searchValue.toLowerCase()) !== -1;
           }
           return item.label.indexOf(searchValue) !== -1;
         });
@@ -215,17 +204,18 @@ Component({
       }
     },
     selectedValue: function (selectedValue) {
-      const data = Array.isArray(selectedValue)
-        ? selectedValue
-        : [selectedValue];
+      const data = Array.isArray(selectedValue) ? selectedValue : [selectedValue];
       const optionMap = this.properties.option.reduce((pre, cur) => {
         pre[cur.value] = cur;
         return pre;
       }, {});
-      const selectedCache = data
-        .map((d) => optionMap[d])
-        .filter((item) => !!item);
+      const selectedCache = data.map((d) => optionMap[d]).filter((item) => !!item);
       this.setData({ selectedCache });
     },
+    loadStatus: function (loadStatus) {
+      this.setData({
+        status: loadStatus,
+      });
+    },
   },
 });

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

@@ -45,6 +45,7 @@
   padding: 5px 16px;
   overflow: auto;
   flex: 1 1 0px;
+  box-sizing: border-box;
 }
 
 .weda-ui-custom-picker__header-btn {
@@ -81,10 +82,6 @@
   /* height: 199px; */
 }
 
-.weda-ui-custom-picker__cloumn::-webkit-scrollbar {
-  display: none;
-}
-
 .weda-ui-custom-picker__cloumn-item {
   display: flex;
   align-items: center;
@@ -292,8 +289,7 @@
   transform: translateX(0);
 }
 
-.weda-ui-custom-search.is-focused
-  .weda-ui-custom-search-box__search-placeholder {
+.weda-ui-custom-search.is-focused .weda-ui-custom-search-box__search-placeholder {
   display: none;
 }
 

package/components/form/selectMultiple/index.js

@@ -4,7 +4,8 @@ import { callDataSourceApi } from '../../../utils/tcb';
 import { arrayToMap } from '../../../utils/tool';
 import lodashGet from 'lodash.get';
 import deepEqual from '../../../utils/deepEqual';
-import { getWhereList } from '../../../utils/platform';
+import destr from '../../../utils/destr';
+import { getDefaultQuery } from '../../../utils/getModelParams';
 
 // 判断值为空，展示placeholder
 export const isEmpty = (v) => {
@@ -118,6 +119,7 @@ Component({
     preWhere: [], // 对比 where 监听
     whereEffected: [], // 每次请求都加上
     fetchTimed: null, // 防抖
+    queryParam: { select: { $master: true } },
   },
   lifetimes: {
     attached() {
@@ -142,8 +144,6 @@ Component({
       this.setData({
         option: range,
         loadStatus: range.length > 0 ? 0 : -1,
-      });
-      this.setData({
         value: this.properties.defaultValue,
         cls,
         subCls,
@@ -198,10 +198,17 @@ Component({
     option: function (options) {
       this.triggerEvent('changeOptions', { value: { options } });
     },
-    where: function (where) {
-      if (deepEqual(where, this.data.preWhere)) return;
-      const whereEffected = [].concat(getWhereList(where));
-      this.setData({ preWhere: where, whereEffected }, () => {
+    'where,queryCondition,sorter': function (where, queryCondition, sorter) {
+      const _queryParam = getDefaultQuery({
+        supportManyRelated: this.data.supportManyRelated,
+        queryCondition,
+        where,
+        sorter,
+      });
+      if (deepEqual(_queryParam, this.data.queryParam)) {
+        return;
+      }
+      this.setData({ queryParam: _queryParam }, () => {
         this._initFetchData();
       });
     },
@@ -247,30 +254,42 @@ Component({
       this.triggerEvent('change', e.detail);
     },
     // 初始化搜索数据，包括属性变化/搜索值变化
-    _initFetchData: function (_where = []) {
+    _initFetchData: function (searchValue) {
       clearTimeout(this.data.fetchTimed);
       // 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) {
           this.setData({ records: [], option: [], pageNo: 1 });
-          this._fetchData(1, _where, true);
+          this._fetchData({ searchValue, _init: true });
         }
       }, 300);
     },
     // 获取数据列表：一对多，多对多
-    _fetchData: async function (_pageNo, _where = [], _init = false) {
+
+    _fetchData: async function ({ queryParam = this.data.queryParam, searchValue = '', pageNo = 1, _init = false }) {
       const { dataSourceName, primaryField } = this.properties;
       if (!dataSourceName) return;
-
+      //   默认筛选条件
+      let _filter = destr(this.data.queryParam.filter) ?? {};
+      // 根据搜索值查询
+      if (searchValue) {
+        const search = this.data.ignoreCase ? '$search_ci' : '$search';
+        _filter = {
+          where: {
+            $and: [_filter.where, { $and: [{ [this.data.primaryField]: { [`${search}`]: searchValue } }] }],
+          },
+        };
+      }
       const records = _init ? [] : this.data.records;
-      const pageSize = 200;
+      const pageSize = 50;
       const res = await callDataSourceApi({
         dataSourceName: dataSourceName,
-        methodName: 'wedaGetRecords',
+        methodName: 'wedaGetRecordsV2',
         params: {
-          where: [{ $and: [...this.data.whereEffected, ..._where] }],
-          _pageNo,
+          ...queryParam,
+          filter: _filter,
+          pageNumber: pageNo,
           pageSize,
         },
       });
@@ -280,44 +299,41 @@ Component({
         label: item[primaryField],
         value: item._id,
       }));
-      if (this.data.records.length === 0 && results?.length === 0) {
-        // 当异常的时候，主要为了不引起records的observer变化变化设置默认值
-        this.setData({
-          loadStatus: -1,
-        });
-      } else {
-        this.setData({
-          records: records.concat(results || []),
-          loadStatus: status,
-        });
-      }
-      const finalRecords = records.concat(results || []);
 
-      if (finalRecords && finalRecords.length > 0) {
-        const { value } = this.data;
-        const label = this.getLabels(value, finalRecords);
-        const stringRange = this.getChecks(value, finalRecords);
-        // 默认
-        this.setData({
-          option: stringRange,
-          loadStatus: results.length > 0 ? 0 : -1,
-          displayLabel: label,
+      let finalRecords = records.concat(results || []);
+      finalRecords = this.getUniqueOption(finalRecords);
+      const { value } = this.data;
+
+      const unchecked = value.filter((i) => !finalRecords.find((j) => i === j.value));
+      // 跨页勾选回显示
+      if (unchecked.length) {
+        const uncheckedItem = await this.fetchItem(unchecked);
+        uncheckedItem?.forEach((i) => {
+          if (i) {
+            finalRecords.unshift(i);
+          }
         });
-        return;
       }
+      const label = this.getLabels(value, finalRecords);
+      const stringRange = this.getChecks(value, finalRecords);
       let status = 0;
       if (!results) {
         status = 2;
-      } else if (results.length === 0) {
+      } else if (finalRecords.length === 0) {
         status = 3;
-      } else {
-        status = results.length === 200 ? 1 : 0;
       }
+
+      // 默认
+      this.setData({
+        option: stringRange,
+        displayLabel: label,
+        records: finalRecords,
+        loadStatus: status,
+      });
     },
     _childFetchData: function (e) {
       const { pageNo, searchValue } = e.detail;
-      const _where = searchValue ? [{ [this.properties.primaryField]: { $search: searchValue } }] : [];
-      this._fetchData(pageNo, _where);
+      this._fetchData({ pageNo, searchValue });
     },
     getLabels: function (values, options) {
       let labels = values;
@@ -341,6 +357,41 @@ Component({
       });
       return stringRange;
     },
+    fetchItem: async function (values) {
+      const { queryParam, dataSourceName, primaryField } = this.data;
+      const _filter = {
+        where: {
+          $and: [{ $or: values.map((i) => ({ _id: { $search: i } })) }],
+        },
+      };
+      let data = await callDataSourceApi({
+        dataSourceName: dataSourceName,
+        methodName: 'wedaGetRecordsV2',
+        params: {
+          ...queryParam,
+          filter: _filter,
+          pageNumber: 1,
+          pageSize: 200,
+        },
+      });
+      return (
+        data?.records?.map((item) => ({
+          ...item,
+          label: item[primaryField],
+          value: item._id,
+        })) || []
+      );
+    },
+    getUniqueOption: function (option) {
+      const optionMap = option.reduce((acc, item) => {
+        if (!acc[item.value]) {
+          acc[item.value] = item;
+        }
+        return acc;
+      }, {});
+      const uniqueOption = Object.values(optionMap)?.filter((item) => item?.value);
+      return uniqueOption;
+    },
     onSearch(event) {
       const { noEvent, value: searchValue } = event.detail;
 
@@ -348,10 +399,8 @@ Component({
       if (!noEvent) {
         this.triggerEvent('search', { value: searchValue });
       }
-
       // 接口搜索
-      const _where = searchValue ? [{ [this.properties.primaryField]: { $search: searchValue } }] : [];
-      this._initFetchData(_where);
+      this._initFetchData(searchValue);
     },
   },
 });

package/components/form/uploader/index.js

@@ -1,4 +1,4 @@
-import { getCloudInstance, getTempFileURL } from '../../../utils/tcb';
+import { getCloudInstance, getTempFileURL, getDefaultUploadPath } from '../../../utils/tcb';
 import { randomStr } from '../../../utils/platform';
 import { compressImage } from './compress';
 import { isNil } from '../../../utils/lodash';
@@ -128,22 +128,14 @@ Component({
           try {
             const ret = await callbacks.beforeUpload({
               tempFilePaths: tempFilePaths,
-              base64Uri: files.contents.map(
-                (content) =>
-                  `data:image/jpg;base64,${wx.arrayBufferToBase64(content)}`
-              ),
+              base64Uri: files.contents.map((content) => `data:image/jpg;base64,${wx.arrayBufferToBase64(content)}`),
             });
             if (typeof ret === 'boolean') {
               shouldUploadToCos = ret;
-            } else if (
-              Array.isArray(ret) &&
-              ret.every((item) => typeof item === 'string')
-            ) {
+            } else if (Array.isArray(ret) && ret.every((item) => typeof item === 'string')) {
               tempFilePaths = ret;
             } else if (!isNil(ret)) {
-              throw new TypeError(
-                '小程序端返回值接受布尔值 / 小程序文件临时路径数组'
-              );
+              throw new TypeError('小程序端返回值接受布尔值 / 小程序文件临时路径数组');
             }
           } catch (err) {
             console.error('上传前处理函数抛错', err);
@@ -156,7 +148,8 @@ Component({
         const tcb = await getCloudInstance();
         const uploadPromise = tempFilePaths.map(async (tempFilePath) => {
           const fileType = tempFilePath.split('.')[1];
-          const cloudPath = `${uploadPath}/${randomStr()}-${Date.now()}.${fileType}`;
+          const _uploadPath = await getDefaultUploadPath(uploadPath);
+          const cloudPath = `${_uploadPath}/${randomStr()}-${Date.now()}.${fileType}`;
           let filePath = tempFilePath;
           if (this.data.isCompressBeforeUpload) {
             try {
@@ -274,8 +267,7 @@ Component({
     },
     layout: function (layout) {
       const _layout = layout !== 'vertical' ? 'horizontal' : 'vertical';
-      const layoutCls =
-        _layout === 'horizontal' ? 'weda-formcells weui-flex' : '';
+      const layoutCls = _layout === 'horizontal' ? 'weda-formcells weui-flex' : '';
       this.setData({ _layout, layoutCls });
     },
     sourceType: function (sourceType) {

package/components/form/uploaderFile/index.js

@@ -1,4 +1,4 @@
-import { getCloudInstance, getTempFileURL } from '../../../utils/tcb';
+import { getCloudInstance, getTempFileURL, getDefaultUploadPath } from '../../../utils/tcb';
 import { transSize, randomStr } from '../../../utils/platform';
 import equal from '../../../utils/deepEqual';
 
@@ -250,7 +250,8 @@ Component({
         ..._tempFile,
       };
       const uploadPath = 'weda-uploader';
-      const cloudPath = `${uploadPath}/${randomStr()}-${tempFile.name}`;
+      const _uploadPath = await getDefaultUploadPath(uploadPath);
+      const cloudPath = `${_uploadPath}/${randomStr()}-${tempFile.name}`;
       try {
         const tcb = await getCloudInstance();
         const uploadTask = await tcb.uploadFile({