@cloudbase/weda-ui 3.13.1 → 3.13.2

package/dist/web/components/wd-table/hooks/useChooseList.js

@@ -1,5 +1,16 @@
 import { useState, useEffect, useCallback } from 'react';
 const defaultPage = 1;
+const getUniqueOption = (option) => {
+    var _a;
+    const optionMap = option.reduce((acc, item) => {
+        if (!acc[item.value]) {
+            acc[item.value] = item;
+        }
+        return acc;
+    }, {});
+    const uniqueOption = (_a = Object.values(optionMap)) === null || _a === void 0 ? void 0 : _a.filter((item) => item === null || item === void 0 ? void 0 : item.value);
+    return uniqueOption;
+};
 const getDataBase = (format, fields) => {
     const filter = fields.filter((item) => (item === null || item === void 0 ? void 0 : item.format) === format);
     const data = filter === null || filter === void 0 ? void 0 : filter.map((item) => {
@@ -43,7 +54,7 @@ export const mapResult = (records, primaryColumn) => {
         extra: childItem,
     }));
 };
-export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value }) => {
+export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value, isInsertSelectedValue = true, }) => {
     const [option, setOption] = useState([]);
     const [total, setTotal] = useState(0);
     const [loading, setLoading] = useState(true);
@@ -63,7 +74,7 @@ export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primary
                 db: childDbName,
             }),
         ];
-        if (value) {
+        if (value && isInsertSelectedValue) {
             if (isMultiple) {
                 value.forEach((i) => {
                     if (i) {
@@ -83,7 +94,7 @@ export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primary
         let transformedRecords = [...((result === null || result === void 0 ? void 0 : result.records) || [])];
         const itemResult = [...rest];
         // 若下拉列表中无选中值，则将选中值插到数组头部
-        if ((isMultiple && (value === null || value === void 0 ? void 0 : value.length)) || value) {
+        if ((isMultiple && (value === null || value === void 0 ? void 0 : value.length) && isInsertSelectedValue) || (value && isInsertSelectedValue)) {
             itemResult.forEach((i) => {
                 transformedRecords = unshiftVal(transformedRecords, i, option);
             });
@@ -92,6 +103,7 @@ export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primary
         if ((queryParams === null || queryParams === void 0 ? void 0 : queryParams.pageNo) > defaultPage) {
             optionRes = [...option, ...optionRes];
         }
+        optionRes = getUniqueOption(optionRes);
         setOption(optionRes);
         setTotal(result === null || result === void 0 ? void 0 : result.total);
         setLoading(false);

package/dist/web/utils/moment.js

@@ -8,6 +8,9 @@ export const convertMoment = (val) => {
     let m = null;
     try {
         m = moment(val);
+        if (Object.prototype.hasOwnProperty.call(val, '$date')) {
+            m = moment(val.$date);
+        }
         if (!(m === null || m === void 0 ? void 0 : m.isValid()))
             return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.13.1",
+  "version": "3.13.2",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -85,7 +85,7 @@
   "description": "腾讯云微搭低代码组件库模板",
   "dependencies": {
     "@antv/g6": "^4.8.5",
-    "@cloudbase/weda-client": "^1.1.14",
+    "@cloudbase/weda-client": "^1.1.15",
     "@codemirror/autocomplete": "^6.16.0",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",
@@ -147,9 +147,9 @@
     "@babel/preset-env": "^7.22.15",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.22.15",
-    "@cloudbase/cals": "^1.2.5",
+    "@cloudbase/cals": "^1.2.7",
     "@cloudbase/lowcode-cli": "^0.22.0",
-    "@cloudbase/weda-cloud-sdk": "^1.0.94",
+    "@cloudbase/weda-cloud-sdk": "^1.0.96",
     "@commitlint/cli": "^16.0.2",
     "@commitlint/config-conventional": "^17.7.0",
     "@craco/craco": "^7.1.0",