@cloudbase/weda-ui 3.10.2 → 3.11.0

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 } = 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) {
@@ -135,6 +135,12 @@ export function getFieldRender(field = {}, extra = {}) {
                 (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] || '-' }));
+                }
                 if (typeof fieldValue === 'string') {
                     return fieldValue && fieldValue !== '-' ? (_jsx(WdTag, { range: fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.split(',').map((i) => ({
                             label: i,
@@ -194,6 +200,9 @@ export function getFieldRender(field = {}, extra = {}) {
                 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 _readValue ? (_jsx(WdTag, { range: _readValue === null || _readValue === void 0 ? void 0 : _readValue.split(',').map((i) => ({
                         label: i,
                         value: i,
@@ -314,6 +323,7 @@ export const DataTableView = ({ fields, value }) => {
             fields: rawFieldsSort,
             isH5: false,
             supportManyRelated: false,
+            showRelationWithTag: false,
         });
         return baseColumns;
     }, [rawFields]);
@@ -412,8 +422,8 @@ export const formatNumberFix = (val, field, setZero = false) => {
  * 根据 fields 信息生成 column
  * h5 和 pc 部分参数不同
  */
-export const getColumns = ({ columnSets = [], fields, isH5 = false, supportManyRelated, }) => fields === null || fields === void 0 ? void 0 : fields.map((item) => formatFieldToColumn(item, isH5, columnSets, supportManyRelated));
-const TableCell = ({ record, field, isH5, supportManyRelated }) => {
+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);
@@ -424,12 +434,14 @@ const TableCell = ({ record, field, isH5, supportManyRelated }) => {
                 relation: record[`@${name}`],
                 supportManyRelated,
                 isH5,
+                showRelationWithTag,
             }
             : {
                 modelType: 'table',
                 relation: record[`@${name}`],
                 supportManyRelated,
                 isH5,
+                showRelationWithTag,
             };
         return getFieldRender(field, extra)(value);
     }, [record, field, isH5]);
@@ -440,7 +452,7 @@ const TableCell = ({ record, field, isH5, supportManyRelated }) => {
  * 根据 field 属性，生成 column 配置
  * https://git.woa.com/QBase/lcap/common-application-specs/blob/master/types/platform/datasource.ts
  */
-export const formatFieldToColumn = (field, isH5, columnSets, supportManyRelated) => {
+export const formatFieldToColumn = (field, isH5, columnSets, supportManyRelated, showRelationWithTag) => {
     const { name, title } = field;
     // 计算列宽度，略大于计算宽度
     const width = getFieldWidth(field) + 10;
@@ -450,7 +462,7 @@ export const formatFieldToColumn = (field, isH5, columnSets, supportManyRelated)
         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 })),
+        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,
         header: title,
@@ -725,7 +737,7 @@ const TableSlotCell = ({ record, rowKey, recordIndex, column, columnIndex, slot,
  * slots: object 模型表格作用域插槽
  * isH5: 判断自定义插槽列能否展示，目前是正常展示
  */
-export const filterCustomColumns = ({ columns, columnSets, slots, fields, isH5, supportManyRelated, }) => {
+export const filterCustomColumns = ({ columns, columnSets, slots, fields, isH5, supportManyRelated, showRelationWithTag, }) => {
     if (!Array.isArray(columnSets) || !(columnSets === null || columnSets === void 0 ? void 0 : columnSets.length))
         return columns;
     const columnSetsReg = columnSets.map((item) => {
@@ -774,6 +786,7 @@ export const filterCustomColumns = ({ columns, columnSets, slots, fields, isH5,
                     rowId: record._id,
                     supportManyRelated,
                     isH5,
+                    showRelationWithTag,
                 }
                 : {
                     modelType: 'table',
@@ -782,6 +795,7 @@ export const filterCustomColumns = ({ columns, columnSets, slots, fields, isH5,
                     rowId: record._id,
                     supportManyRelated,
                     isH5,
+                    showRelationWithTag,
                 };
             const value = getFieldValue(key, record, relatedField, isMany(_oriField));
             const component = getFieldRender(field, extra)(value);
@@ -897,12 +911,13 @@ export const getFixedColumnSets = ({ fixedFront = '', fixedEnd = '', columnSets,
 /**
  * 列管理字段转换
  */
-export const getTableColumns = ({ fields, columnSets, slots, fixedFront, fixedEnd, isH5, supportManyRelated, }) => {
+export const getTableColumns = ({ fields, columnSets, slots, fixedFront, fixedEnd, isH5, supportManyRelated, showRelationWithTag = true, }) => {
     const defaultColumns = getColumns({
         columnSets,
         fields,
         isH5: false,
         supportManyRelated,
+        showRelationWithTag,
     });
     let fixedColumnSets = columnSets;
     // h5端不冻结
@@ -920,6 +935,7 @@ export const getTableColumns = ({ fields, columnSets, slots, fixedFront, fixedEn
         fields,
         isH5,
         supportManyRelated,
+        showRelationWithTag,
     });
     return baseColumns.map((i) => ({
         ...i,

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

@@ -11,4 +11,5 @@ export declare const useChooseList: ({ dataSourceAPI, queryParams, childDbName,
     total: number;
     isValidating: boolean;
     empty: () => void;
+    getRelationOptions: () => Promise<void>;
 };

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

@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 const defaultPage = 1;
 const getDataBase = (format, fields) => {
     const filter = fields.filter((item) => (item === null || item === void 0 ? void 0 : item.format) === format);
@@ -37,41 +37,69 @@ export const mapResult = (records, primaryColumn) => {
     return records === null || records === void 0 ? void 0 : records.map((childItem) => ({
         value: childItem._id,
         text: childItem[primaryColumn] ? childItem[primaryColumn] : childItem._id,
+        label: childItem[primaryColumn] ? childItem[primaryColumn] : childItem._id,
+        extra: childItem,
     }));
 };
 export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value, }) => {
     const [option, setOption] = useState([]);
     const [total, setTotal] = useState(0);
     const [loading, setLoading] = useState(true);
-    useEffect(() => {
-        async function fetchData() {
-            setLoading(true);
-            const [result, itemResult] = await Promise.all([
-                dataSourceAPI.getRecordList(queryParams, {
-                    db: childDbName,
-                }),
-                value
-                    ? dataSourceAPI.getRecord(value, {
-                        db: childDbName,
-                    })
-                    : Promise.resolve(),
-            ]);
-            let transformedRecords = [...((result === null || result === void 0 ? void 0 : result.records) || [])];
-            if (value &&
-                transformedRecords.findIndex((item) => item._id === value) < 0) {
-                transformedRecords = [itemResult, ...transformedRecords];
+    const unshiftVal = (transformedRecords, itemResult) => {
+        if (itemResult &&
+            transformedRecords.findIndex((item) => item._id === itemResult._id) < 0 &&
+            option.findIndex((item) => item._id === itemResult._id) < 0) {
+            return [itemResult, ...transformedRecords];
+        }
+        return transformedRecords;
+    };
+    const fetchData = useCallback(async () => {
+        setLoading(true);
+        const isMultiple = Array.isArray(value);
+        const promiseList = [
+            dataSourceAPI.getRecordList(queryParams, {
+                db: childDbName,
+            }),
+        ];
+        if (value === null || value === void 0 ? void 0 : value.length) {
+            if (isMultiple) {
+                value.forEach((i) => {
+                    if (i) {
+                        promiseList.push(dataSourceAPI.getRecord(i, {
+                            db: childDbName,
+                        }));
+                    }
+                });
             }
-            let optionRes = mapResult(transformedRecords, primaryColumn);
-            if ((queryParams === null || queryParams === void 0 ? void 0 : queryParams.pageNo) > defaultPage) {
-                optionRes = [...option, ...optionRes];
+            else {
+                promiseList.push(dataSourceAPI.getRecord(value, {
+                    db: childDbName,
+                }));
             }
-            setOption(optionRes);
-            setTotal(result === null || result === void 0 ? void 0 : result.total);
-            setLoading(false);
         }
-        fetchData();
+        const [result, ...rest] = await Promise.all(promiseList);
+        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) {
+            itemResult.forEach((i) => {
+                transformedRecords = unshiftVal(transformedRecords, i);
+            });
+        }
+        let optionRes = mapResult(transformedRecords, primaryColumn);
+        if ((queryParams === null || queryParams === void 0 ? void 0 : queryParams.pageNo) > defaultPage) {
+            optionRes = [...option, ...optionRes];
+        }
+        setOption(optionRes);
+        setTotal(result === null || result === void 0 ? void 0 : result.total);
+        setLoading(false);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [childDbName, queryParams]);
+    }, [childDbName, primaryColumn, queryParams]);
+    useEffect(() => {
+        if (childDbName) {
+            fetchData();
+        }
+    }, [childDbName, fetchData]);
     return {
         result: option || [],
         total: total,
@@ -79,5 +107,6 @@ export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primary
         empty: () => {
             setOption([]);
         },
+        getRelationOptions: fetchData,
     };
 };

package/dist/web/utils/platform.js

@@ -284,12 +284,12 @@ export const textToString = (text) => {
  * 统一错误提示
  */
 export function alertErrorMessage({ message, duration = 3000, icon = 'none' }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const smallScreen = (_b = (_a = window === null || window === void 0 ? void 0 : window.matchMedia('(max-width: 768px)')) === null || _a === void 0 ? void 0 : _a.matches) !== null && _b !== void 0 ? _b : isH5Platform();
     const touchDevice = (_d = (_c = window === null || window === void 0 ? void 0 : window.matchMedia('(pointer:coarse)')) === null || _c === void 0 ? void 0 : _c.matches) !== null && _d !== void 0 ? _d : smallScreen;
     const platform = touchDevice || smallScreen ? 'h5' : 'pc';
-    if (platform === 'h5') {
-        (_e = window === null || window === void 0 ? void 0 : window.app) === null || _e === void 0 ? void 0 : _e.showToast({
+    if (platform === 'h5' && ((_e = window === null || window === void 0 ? void 0 : window.app) === null || _e === void 0 ? void 0 : _e.showToast)) {
+        (_f = window === null || window === void 0 ? void 0 : window.app) === null || _f === void 0 ? void 0 : _f.showToast({
             title: message,
             icon,
             duration,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.10.2",
+  "version": "3.11.0",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -274,7 +274,7 @@
         "!.temp/dist/*.map"
       ],
       "webpack": false,
-      "limit": "900 KB"
+      "limit": "950 KB"
     }
   ],
   "nyc": {