@cloudbase/weda-ui 3.13.0 → 3.13.2

package/dist/web/components/wd-table/components/FieldRender/index.js

@@ -39,7 +39,7 @@ export const TextWrap = React.memo(function TextWrapComp(props) {
 export function getFieldRender(field = {}, extra = {}) {
     var _a;
     const { type, format, items, properties, title, parentDatasource } = field;
-    const { modelType, showTip = true, detailText = '详情', isH5, showRelationWithTag = true, } = extra;
+    const { modelType, showTip = true, detailText = '详情', isH5, showRelationWithTag = true } = extra;
     const textProps = { showTip };
     // 枚举-旧，新版 TODO
     if ((_a = field['x-enumObj']) === null || _a === void 0 ? void 0 : _a.length) {
@@ -81,7 +81,7 @@ export function getFieldRender(field = {}, extra = {}) {
                         properties: locationProperties,
                     },
                 };
-                return (_jsx(ArrayComponent, { isH5: isH5, value: value, modelType: modelType, field: locationField, items: items }));
+                return _jsx(ArrayComponent, { isH5: isH5, value: value, modelType: modelType, field: locationField, items: items });
             }
             if (modelType === 'table') {
                 const content = (_a = formatLocationData(val)) === null || _a === void 0 ? void 0 : _a.flatContent;
@@ -115,10 +115,9 @@ export function getFieldRender(field = {}, extra = {}) {
             }
             else if (format === 'x-file') {
                 // 文件
-                return (_jsx(UploaderFileView, { value: fieldValue, single: (extra === null || extra === void 0 ? void 0 : extra.modelType) !== 'detail' }));
+                return _jsx(UploaderFileView, { value: fieldValue, single: (extra === null || extra === void 0 ? void 0 : extra.modelType) !== 'detail' });
             }
-            else if (!(extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) &&
-                isShowOrgsView(field, modelType)) {
+            else if (!(extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) && isShowOrgsView(field, modelType)) {
                 return (_jsx(ViewCell, { data: fieldValue, showType: modelType, 
                     // type={field['x-parent']?.parentDataSourceName === 'sys_department' ? 'org' : 'user'}
                     relation: extra === null || extra === void 0 ? void 0 : extra.relation }));
@@ -131,15 +130,14 @@ export function getFieldRender(field = {}, extra = {}) {
                 // 网址
                 return (_jsx("a", { className: "wd-table__a", target: "_blank", href: fieldValue, rel: "noreferrer", children: _jsx(TextWrap, { ...textProps, children: fieldValue }) }));
             }
-            else if ((extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) &&
-                (format === 'father-son' || format === 'related')) {
+            else if ((extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) && (format === 'father-son' || format === 'related')) {
                 const primaryField = ((_b = (_a = field === null || field === void 0 ? void 0 : field.parentDatasource) === null || _a === void 0 ? void 0 : _a.schema) === null || _b === void 0 ? void 0 : _b['x-primary-column']) || '';
                 const relatedField = (_c = extra === null || extra === void 0 ? void 0 : extra.columnSet) === null || _c === void 0 ? void 0 : _c.relatedField;
                 if (!showRelationWithTag) {
                     if (typeof fieldValue === 'string') {
                         return _jsx(TextWrap, { ...textProps, children: fieldValue });
                     }
-                    return (_jsx(TextWrap, { ...textProps, children: fieldValue[relatedField] || fieldValue[primaryField] || '-' }));
+                    return _jsx(TextWrap, { ...textProps, children: fieldValue[relatedField] || fieldValue[primaryField] || '-' });
                 }
                 if (typeof fieldValue === 'string') {
                     return fieldValue && fieldValue !== '-' ? (_jsx(WdTag, { range: fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.split(',').map((i) => ({
@@ -167,6 +165,10 @@ export function getFieldRender(field = {}, extra = {}) {
         }
         else if (type === 'number') {
             fieldValue = formatNumber(val, field);
+            if (Object.prototype.hasOwnProperty.call(val, '$date')) {
+                field.format = 'datetime';
+                fieldValue = formatNumber(val.$date, field);
+            }
             return _jsx(TextWrap, { children: fieldValue });
         }
         else if (type === 'boolean') {
@@ -176,7 +178,7 @@ export function getFieldRender(field = {}, extra = {}) {
         else if (type === 'object') {
             const objectRender = ({ value, modelType, fields }) => {
                 if (typeof val === 'object') {
-                    return (_jsx(DataItemView, { value: value, modelType: modelType, fields: fields, isH5: isH5 }));
+                    return _jsx(DataItemView, { value: value, modelType: modelType, fields: fields, isH5: isH5 });
                 }
                 return _jsx(TextWrap, { ...textProps, children: value });
             };
@@ -194,14 +196,12 @@ export function getFieldRender(field = {}, extra = {}) {
                     fields: properties,
                 });
             }
-            else if (format === 'many-one' ||
-                format === 'one-one' ||
-                format === 'one-one-r') {
+            else if (format === 'many-one' || format === 'one-one' || format === 'one-one-r') {
                 const primaryField = ((_e = (_d = field === null || field === void 0 ? void 0 : field.parentDatasource) === null || _d === void 0 ? void 0 : _d.schema) === null || _e === void 0 ? void 0 : _e['x-primary-column']) || '';
                 const relatedField = (_f = extra === null || extra === void 0 ? void 0 : extra.columnSet) === null || _f === void 0 ? void 0 : _f.relatedField;
                 const _readValue = fieldValue[relatedField] || fieldValue[primaryField];
                 if (!showRelationWithTag) {
-                    return (_jsx(TextWrap, { ...textProps, children: fieldValue[relatedField] || fieldValue[primaryField] }));
+                    return _jsx(TextWrap, { ...textProps, children: fieldValue[relatedField] || fieldValue[primaryField] });
                 }
                 return _readValue ? (_jsx(WdTag, { range: _readValue === null || _readValue === void 0 ? void 0 : _readValue.split(',').map((i) => ({
                         label: i,
@@ -219,8 +219,7 @@ export function getFieldRender(field = {}, extra = {}) {
             }
         }
         else if (type === 'array') {
-            if (field.name === '_departmentList' &&
-                ['table', 'detail'].includes(modelType)) {
+            if (field.name === '_departmentList' && ['table', 'detail'].includes(modelType)) {
                 return _jsx(TextWrap, { ...textProps, children: val || '-' });
             }
             if (format === 'x-enum') {
@@ -243,8 +242,7 @@ export function getFieldRender(field = {}, extra = {}) {
                 // 文件数组，在详情页和表格页展示不同
                 return _jsx(UploaderFileView, { value: fieldValue, single: false });
             }
-            else if ((extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) &&
-                (format === 'one-many' || format === 'many-many')) {
+            else if ((extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) && (format === 'one-many' || format === 'many-many')) {
                 const primaryField = ((_h = (_g = field === null || field === void 0 ? void 0 : field.parentDatasource) === null || _g === void 0 ? void 0 : _g.schema) === null || _h === void 0 ? void 0 : _h['x-primary-column']) || '';
                 const relatedField = (_j = extra === null || extra === void 0 ? void 0 : extra.columnSet) === null || _j === void 0 ? void 0 : _j.relatedField;
                 const rowId = extra === null || extra === void 0 ? void 0 : extra.rowId;
@@ -252,8 +250,7 @@ export function getFieldRender(field = {}, extra = {}) {
                 const propertyArr = Object.keys(properties);
                 const relatedKey = propertyArr.find((item) => {
                     var _a;
-                    if (properties[item].format === 'many-one' ||
-                        properties[item].format === 'many-many') {
+                    if (properties[item].format === 'many-one' || properties[item].format === 'many-many') {
                         return ((_a = properties[item]['x-parent']) === null || _a === void 0 ? void 0 : _a.parentFieldKey) === field.name;
                     }
                     else {
@@ -287,7 +284,7 @@ export function getFieldRender(field = {}, extra = {}) {
             }
             else {
                 fieldValue = safeJsonParse(val);
-                return (_jsx(ArrayComponent, { isH5: isH5, value: fieldValue, field: field, modelType: modelType, items: items }));
+                return _jsx(ArrayComponent, { isH5: isH5, value: fieldValue, field: field, modelType: modelType, items: items });
             }
         }
         return _jsx("span", { children: JSON.stringify(fieldValue) });
@@ -368,8 +365,7 @@ const ArrayComponent = ({ items, modelType, value, field, isH5 }) => {
 export const formatNumber = (value, field) => {
     let newValue = value;
     try {
-        if (['date', 'time', 'datetime'].includes(field === null || field === void 0 ? void 0 : field.format) &&
-            typeof value === 'number') {
+        if (['date', 'time', 'datetime'].includes(field === null || field === void 0 ? void 0 : field.format) && typeof value === 'number') {
             newValue = formatTimeByType(field === null || field === void 0 ? void 0 : field.format, value, field);
         }
         else {
@@ -433,8 +429,8 @@ export const formatNumberFix = (val, field, setZero = false) => {
  * 根据 fields 信息生成 column
  * h5 和 pc 部分参数不同
  */
-export const getColumns = ({ columnSets = [], fields, isH5 = false, supportManyRelated, showRelationWithTag, }) => fields === null || fields === void 0 ? void 0 : fields.map((item) => formatFieldToColumn(item, isH5, columnSets, supportManyRelated, showRelationWithTag));
-const TableCell = ({ record, field, isH5, supportManyRelated, showRelationWithTag, }) => {
+export const getColumns = ({ columnSets = [], fields, isH5 = false, supportManyRelated, showRelationWithTag }) => fields === null || fields === void 0 ? void 0 : fields.map((item) => formatFieldToColumn(item, isH5, columnSets, supportManyRelated, showRelationWithTag));
+const TableCell = ({ record, field, isH5, supportManyRelated, showRelationWithTag }) => {
     const component = React.useMemo(() => {
         const { name } = field;
         const value = getFieldValue(name, record);
@@ -457,7 +453,7 @@ const TableCell = ({ record, field, isH5, supportManyRelated, showRelationWithTa
         return getFieldRender(field, extra)(value);
     }, [record, field, isH5]);
     // 处理渲染错误
-    return (_jsx(ErrorBoundary, { FallbackComponent: () => _jsx("span", { className: "", children: "\u274C \u6570\u636E\u5F02\u5E38" }), children: component }));
+    return _jsx(ErrorBoundary, { FallbackComponent: () => _jsx("span", { className: "", children: "\u274C \u6570\u636E\u5F02\u5E38" }), children: component });
 };
 /**
  * 根据 field 属性，生成 column 配置
@@ -470,9 +466,7 @@ export const formatFieldToColumn = (field, isH5, columnSets, supportManyRelated,
     const item = columnSets === null || columnSets === void 0 ? void 0 : columnSets.find((i) => i.key === name);
     const isIllegalWidth = typeof (item === null || item === void 0 ? void 0 : item.width) !== 'number';
     return {
-        width: !item || (item === null || item === void 0 ? void 0 : item.widthType) === 'auto' || isIllegalWidth
-            ? width
-            : item === null || item === void 0 ? void 0 : item.width,
+        width: !item || (item === null || item === void 0 ? void 0 : item.widthType) === 'auto' || isIllegalWidth ? width : item === null || item === void 0 ? void 0 : item.width,
         render: (record) => (_jsx(TableCell, { record: record, field: field, isH5: isH5, supportManyRelated: supportManyRelated, showRelationWithTag: showRelationWithTag })),
         key: name,
         slotKey: (item === null || item === void 0 ? void 0 : item.slotKey) || name,
@@ -515,9 +509,7 @@ export const getFieldWidth = (field) => {
     // 按类型列宽度
     const typeWidth = ((_a = TypeFormatWidthMap === null || TypeFormatWidthMap === void 0 ? void 0 : TypeFormatWidthMap[type]) === null || _a === void 0 ? void 0 : _a[format || (items === null || items === void 0 ? void 0 : items.format) || 'default']) || 0;
     // 最终宽度
-    const width = typeWidth
-        ? Math.max(nameWidth, typeWidth)
-        : Math.max(nameWidth, 120);
+    const width = typeWidth ? Math.max(nameWidth, typeWidth) : Math.max(nameWidth, 120);
     return width;
 };
 /**
@@ -595,9 +587,7 @@ export const formatDataToExport = (datas, fields, enumOptions = {}) => {
                             newDatas[zhTitle] = formatDataToExport([].concat(data), Object.values(((_d = field === null || field === void 0 ? void 0 : field.items) === null || _d === void 0 ? void 0 : _d.properties) || {}));
                         }
                         else if (((_e = field === null || field === void 0 ? void 0 : field.items) === null || _e === void 0 ? void 0 : _e.type) === 'number') {
-                            newDatas[zhTitle] = []
-                                .concat(data)
-                                .map((d) => formatNumber(d, field === null || field === void 0 ? void 0 : field.items));
+                            newDatas[zhTitle] = [].concat(data).map((d) => formatNumber(d, field === null || field === void 0 ? void 0 : field.items));
                         }
                         else if (((_f = field === null || field === void 0 ? void 0 : field.items) === null || _f === void 0 ? void 0 : _f.type) === 'boolean') {
                             newDatas[zhTitle] = [].concat(data).map((d) => formatBoolean(d));
@@ -732,7 +722,7 @@ export const slotRender = (Slot, props = {}) => {
     }
     return Slot !== null && Slot !== void 0 ? Slot : null;
 };
-const TableSlotCell = ({ record, rowKey, recordIndex, column, columnIndex, slot, }) => {
+const TableSlotCell = ({ record, rowKey, recordIndex, column, columnIndex, slot }) => {
     return slotRender(slot, {
         record,
         rowKey,
@@ -810,12 +800,11 @@ export const filterCustomColumns = ({ columns, columnSets, slots, fields, isH5,
                 };
             const value = getFieldValue(key, record, relatedField, isMany(_oriField));
             const component = getFieldRender(field, extra)(value);
-            return (_jsx(ErrorBoundary, { FallbackComponent: () => _jsx("span", { className: "", children: "\u274C \u6570\u636E\u5F02\u5E38" }), children: component }));
+            return _jsx(ErrorBoundary, { FallbackComponent: () => _jsx("span", { className: "", children: "\u274C \u6570\u636E\u5F02\u5E38" }), children: component });
         };
         const _oriWidth = getFieldWidth(field) + 10;
         const isIllegalWidth = typeof (item2 === null || item2 === void 0 ? void 0 : item2.width) !== 'number';
-        item2.width =
-            (item2 === null || item2 === void 0 ? void 0 : item2.widthType) === 'auto' || isIllegalWidth ? _oriWidth : item2 === null || item2 === void 0 ? void 0 : item2.width;
+        item2.width = (item2 === null || item2 === void 0 ? void 0 : item2.widthType) === 'auto' || isIllegalWidth ? _oriWidth : item2 === null || item2 === void 0 ? void 0 : item2.width;
         // 拿到自定义列属性值
         const customColumn = {
             ...columnsMap[key],
@@ -882,22 +871,20 @@ const getCustomField = (_field, columnSet) => {
  * 过滤字段列表
  * 导出/搜索框，不展示自定义列
  */
-export const filterCustomFields = ({ fields, columnSets, isFilterGenre = false, }) => {
+export const filterCustomFields = ({ fields, columnSets, isFilterGenre = false }) => {
     if (!Array.isArray(fields))
         return [];
     if (!Array.isArray(columnSets))
         return fields;
     const fieldsMap = fromEntries(fields.map((item) => [item.name, item]));
     return columnSets
-        .filter((item1) => (item1 === null || item1 === void 0 ? void 0 : item1.key) &&
-        fieldsMap[item1.key] &&
-        ((item1 === null || item1 === void 0 ? void 0 : item1.genre) !== 'slot' || isFilterGenre))
+        .filter((item1) => (item1 === null || item1 === void 0 ? void 0 : item1.key) && fieldsMap[item1.key] && ((item1 === null || item1 === void 0 ? void 0 : item1.genre) !== 'slot' || isFilterGenre))
         .map((item2) => ({ ...fieldsMap[item2.key], title: item2.header }));
 };
 /**
  * 列管理加入冻结属性
  */
-export const getFixedColumnSets = ({ fixedFront = '', fixedEnd = '', columnSets, }) => {
+export const getFixedColumnSets = ({ fixedFront = '', fixedEnd = '', columnSets }) => {
     if (!Array.isArray(columnSets))
         return columnSets;
     const fixedFrontIndex = columnSets.findIndex((item) => (item === null || item === void 0 ? void 0 : item.key) && item.key.length > 0 && item.key === fixedFront);
@@ -905,9 +892,7 @@ export const getFixedColumnSets = ({ fixedFront = '', fixedEnd = '', columnSets,
     return Array.isArray(columnSets)
         ? columnSets.map((item, index) => {
             // 当冻结尾列在冻结前列之后时，冻结尾列属性才生效
-            if (fixedEndIndex >= 0 &&
-                fixedEndIndex > fixedFrontIndex &&
-                index >= fixedEndIndex) {
+            if (fixedEndIndex >= 0 && fixedEndIndex > fixedFrontIndex && index >= fixedEndIndex) {
                 return { ...item, fixed: 'right' };
             }
             else if (fixedFrontIndex >= 0 && index <= fixedFrontIndex) {

package/dist/web/components/wd-table/hooks/useChooseList.d.ts

@@ -1,11 +1,12 @@
 export declare const getDataBaseInfo: (fields: any, format: any, childDbName: any) => any;
 export declare const mapResult: (records: any, primaryColumn: any) => any;
-export declare const useChooseList: ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value }: {
+export declare const useChooseList: ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value, isInsertSelectedValue, }: {
     dataSourceAPI: any;
     queryParams: any;
     childDbName: any;
     primaryColumn: any;
     value: any;
+    isInsertSelectedValue?: boolean;
 }) => {
     result: any[];
     total: number;

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) => {
@@ -34,7 +45,8 @@ export const getDataBaseInfo = (fields, format, childDbName) => {
     return dataBase;
 };
 export const mapResult = (records, primaryColumn) => {
-    return records === null || records === void 0 ? void 0 : records.map((childItem) => ({
+    var _a;
+    return (_a = records === null || records === void 0 ? void 0 : records.filter((i) => i._id)) === null || _a === void 0 ? void 0 : _a.map((childItem) => ({
         _id: childItem._id,
         value: childItem._id,
         text: childItem[primaryColumn] ? childItem[primaryColumn] : childItem._id,
@@ -42,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);
@@ -62,7 +74,7 @@ export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primary
                 db: childDbName,
             }),
         ];
-        if (value) {
+        if (value && isInsertSelectedValue) {
             if (isMultiple) {
                 value.forEach((i) => {
                     if (i) {
@@ -82,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);
             });
@@ -91,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/components/wd-table/wd-table.js

@@ -73,7 +73,8 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
     isSuspendFooter = true, // 是否分页器在页面底部悬停
     isSupportMultipleSort = false, // 是否支持多字段排序
     sorter, // 排序规则
-    __innerSlot, ...props } = tableProps;
+    __innerSlot, enableRelationTag = true, // 关联关系字段是否开启关联标签
+    ...props } = tableProps;
     const wList = convertWhere(props, supportManyRelated); // 查询参数
     const { classPrefix } = useConfig();
     const platform = usePlatform();
@@ -211,6 +212,7 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
             fixedEnd,
             isH5,
             supportManyRelated,
+            showRelationWithTag: enableRelationTag,
         });
         // 操作列
         if (enableCellCustomOption && !isH5) {
@@ -259,11 +261,12 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
         fixedFront,
         fixedEnd,
         isH5,
+        supportManyRelated,
+        enableRelationTag,
         enableCellCustomOption,
-        customOptionTitle,
         columnSelectType,
+        customOptionTitle,
         classPrefix,
-        supportManyRelated,
         resizeColumns,
     ]);
     // 主键

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.0",
+  "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",