@cloudbase/weda-ui 3.4.9-alpha.1024 → 3.4.10

package/dist/web/components/wd-form/index.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 /* eslint max-lines: [error, 500] */
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, } from 'react';
-import { useList, useMap, useMountEffect, useSyncedRef, } from '@react-hookz/web';
+import { useDebouncedCallback, useMap, useMountEffect, useSyncedRef, } from '@react-hookz/web';
 import { isInIde, usePlatform } from '../../utils/platform';
 import { ConfigProvider, Form as TeaForm } from 'tea-component';
 import classNames from '../../utils/classnames';
@@ -23,6 +23,12 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
     // 兼容流程setValue调用，其他地方别用
     $node, } = props;
     const formItemMap = useMap([]);
+    /**
+     * 根据他的文档
+     * 上面返回的 formItemMap 引用会保持不变，但是Map的方法会导致重渲染
+     * 所以要用它作useEffect deps的时候用下面这个string
+     *  */
+    const formItemMapKey = [...formItemMap.keys()].sort().join(',');
     const platform = usePlatform();
     const contentSlot = useMemo(() => contentSlotEl, [contentSlotEl]);
     const cls = classNames({
@@ -84,6 +90,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             const formData = getFormDataFromItemMap(formItemMap);
             if (!isObjectEqual(formData, preFormCtxRef.current, true)) {
                 (_b = (_a = eventsRef === null || eventsRef === void 0 ? void 0 : eventsRef.current) === null || _a === void 0 ? void 0 : _a.onDataChange) === null || _b === void 0 ? void 0 : _b.call(_a, { data: formData });
+                setFormData(formData);
                 preFormCtxRef.current = formData;
             }
         });
@@ -120,28 +127,27 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
     // useWhatChanged([formItemMap, initialValues, submit, validate]);
     useLoopRenderDetect();
     const { ready } = useWedaAppContext();
-    const [recoversFn, { push: addRecoversFn, reset: resetRecoversFn }] = useList([]);
     const previousFormType = useRef(null);
     useEffect(() => {
         if (!ready) {
             return;
         }
-        if (formType === previousFormType.current)
-            return;
+        // if (formType === previousFormType.current) return;
         logger.debug('listen formType', { formType, previousFormType }, formItemMap);
         previousFormType.current = formType;
         Promise.resolve().then(() => {
             if (formType === 'read') {
                 formItemMap.forEach((item) => {
-                    addRecoversFn(item.setReadOnly(true));
+                    item.setReadOnly(true);
                 });
             }
             else {
-                recoversFn.forEach((fn) => fn());
-                resetRecoversFn();
+                formItemMap.forEach((item) => {
+                    item.setReadOnly(item.initialDisabled);
+                });
             }
         });
-    }, [ready, formType, formItemMap, addRecoversFn, recoversFn, resetRecoversFn]);
+    }, [ready, formType, formItemMap, formItemMapKey]);
     useMountEffect(() => {
         logger.debug('formItemMap', formItemMap);
     });
@@ -231,9 +237,16 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
         if (!isInIde()) {
             onInitDataSourceFieldsWithAuth(authValue);
         }
-    }, [authValue, isDataModel, onInitDataSourceFieldsWithAuth, formItemMap]);
+    }, [
+        authValue,
+        isDataModel,
+        onInitDataSourceFieldsWithAuth,
+        formItemMap,
+        formItemMapKey,
+    ]);
     const initedItemMapRef = useRef({});
     const preFormCtxRef = useRef(null);
+    const [formData, setFormData] = useState(() => getFormDataFromItemMap(formItemMap));
     React.useImperativeHandle(ref, () => {
         return {
             formType,
@@ -266,9 +279,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             authValue,
             layout,
             dataSourceName,
-            get value() {
-                return getFormDataFromItemMap(formItemMap);
-            },
+            value: formData,
             remoteValue: fetchedInitialValues,
             updateFormContext,
             dataSourceProfile,
@@ -290,8 +301,9 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
         validate,
         clearValidate,
         updateFormContext,
+        formData,
     ]);
-    const setInitValue = useCallback(() => {
+    const setInitValue = useDebouncedCallback(() => {
         var _a;
         for (const [name, formItem] of formItemMap.entries()) {
             const value = lodashGet(initialValues, name);
@@ -301,7 +313,9 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             }
         }
         updateFormContext();
-    }, [formItemMap, initialValues, updateFormContext]);
+    }, [formItemMap, initialValues, updateFormContext], 
+    // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+    200);
     React.useEffect(() => {
         // 单向 Form向下设置值
         let setValueReady = false;

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

@@ -19,7 +19,7 @@ export const ExportFileModal = ({ fields, columns, isExportFileModalByApiVisible
         return true;
     })) === null || _a === void 0 ? void 0 : _a.sort((a, b) => (a === null || a === void 0 ? void 0 : a['x-index']) - (b === null || b === void 0 ? void 0 : b['x-index']))) === null || _b === void 0 ? void 0 : _b.filter((item) => {
         // 筛选出列管理字段
-        const isVisible = columns === null || columns === void 0 ? void 0 : columns.findIndex((column) => (column === null || column === void 0 ? void 0 : column.fieldKey) === (item === null || item === void 0 ? void 0 : item.name) && (column === null || column === void 0 ? void 0 : column.isExport));
+        const isVisible = columns === null || columns === void 0 ? void 0 : columns.findIndex((column) => (column === null || column === void 0 ? void 0 : column.key) === (item === null || item === void 0 ? void 0 : item.name) && (column === null || column === void 0 ? void 0 : column.isExport));
         // eslint-disable-next-line @typescript-eslint/no-magic-numbers
         return isVisible != -1;
     });

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

@@ -14,6 +14,7 @@ import UploaderFileView from '../../../uploaderFileView';
 import { ViewCell } from './UserDepartment/ViewCell';
 import { QuoteModal } from './QuoteModal';
 import { TABLE_SLOT_PREFIX } from '../../../../utils/constant';
+import { getPrimaryField } from '../../../../utils/datasource';
 import { useConfig } from '../../../../utils/config-context';
 import { ImagePreview } from './ImagePreview';
 const MODAL_SIZE = 'auto';
@@ -46,7 +47,10 @@ export function getFieldRender(field = {}, extra = {}) {
     }
     // render 方法
     const FieldRender = (val) => {
-        if (isValueEmpty(val) || (type === 'array' && !(val === null || val === void 0 ? void 0 : val.length))) {
+        var _a;
+        if (isValueEmpty(val) ||
+            (type === 'array' && !(val === null || val === void 0 ? void 0 : val.length)) ||
+            (type === 'array' && (val === null || val === void 0 ? void 0 : val.length) && !((_a = Object.keys(val[0])) === null || _a === void 0 ? void 0 : _a.length))) {
             return '-';
         }
         // fieldValue 值转换，如布尔/时间/枚举等
@@ -564,8 +568,9 @@ export const getSearchAttributes = (fields) => fields
     }
     return config;
 });
-export const getFieldValue = (name, record) => {
+export const getFieldValue = (name, _record) => {
     var _a;
+    const record = getPrimaryField(_record);
     if (name === '_departmentList')
         return (((_a = record === null || record === void 0 ? void 0 : record['##SHOW']) === null || _a === void 0 ? void 0 : _a._departmentList) || []).join(',');
     return record[name];
@@ -685,7 +690,13 @@ export const getTableColumns = ({ fields, columnSets, slots, fixedFront, fixedEn
     });
     return baseColumns.map((i) => ({
         ...i,
+        // key值默认为字段的name值，同时作为table的key值需要唯一，因此重新设置为slotKey
         key: (i === null || i === void 0 ? void 0 : i.slotKey) || (i === null || i === void 0 ? void 0 : i.key),
+        // 此字段为colum 绑定字段的key值，业务场景使用次字段
         fieldKey: i === null || i === void 0 ? void 0 : i.key,
     }));
 };
+export const mapColumKey = (columnSets) => {
+    // 业务场景，多依赖key字段，还原为字段值
+    return columnSets.map((i) => ({ ...i, key: i.fieldKey }));
+};

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

@@ -34,12 +34,10 @@ export const getDataBaseInfo = (fields, format, childDbName) => {
     return dataBase;
 };
 export const mapResult = (data, primaryColumn) => {
-    var _a, _b;
-    return (_b = (_a = data === null || data === void 0 ? void 0 : data.records) === null || _a === void 0 ? void 0 : _a.filter((item) => primaryColumn in item)) === null || _b === void 0 ? void 0 : _b.map((childItem) => ({
+    var _a;
+    return (_a = data === null || data === void 0 ? void 0 : data.records) === null || _a === void 0 ? void 0 : _a.map((childItem) => ({
         value: childItem._id,
-        text: childItem[primaryColumn].length === 0
-            ? childItem._id
-            : childItem[primaryColumn],
+        text: childItem[primaryColumn] ? childItem[primaryColumn] : childItem._id,
     }));
 };
 export const useChooseList = ({ dataSourceAPI, queryParams, childDbName, primaryColumn, }) => {

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

@@ -1,12 +1,10 @@
 import { useEffect, useCallback, useState } from 'react';
-import { getPrimaryField } from '../../../utils/datasource';
 const defaultPageNo = 1;
 export const useTableData = ({ dataSourceAPI, connectorMethod, query, events, isModel, dbName, isH5, isNoDataSourceBind, }) => {
     const [total, setTotal] = useState(0);
     const [tableLoading, setTableLoading] = useState(true);
     const [tableData, setTableData] = useState([]);
     const fetch = useCallback(async () => {
-        var _a;
         if (isNoDataSourceBind) {
             return;
         }
@@ -14,11 +12,7 @@ export const useTableData = ({ dataSourceAPI, connectorMethod, query, events, is
         setTableLoading(true);
         if (isModel) {
             data = await dataSourceAPI.getRecordList(query);
-            data.records =
-                ((_a = data.records) === null || _a === void 0 ? void 0 : _a.map((item) => {
-                    const temp = getPrimaryField(item);
-                    return { ...temp };
-                })) || [];
+            data.records = data.records || [];
         }
         else if (connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name) {
             data = await dataSourceAPI.getConnect(connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name, query);

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

@@ -2,6 +2,23 @@
 import { getDataSourceFieldsWithAuth } from '../../../utils/datasource';
 import { TABLE_SLOT_PREFIX, GLOBAL_BUTTON, REL_DICT, } from '../../../utils/constant';
 import { callWedaApi, appCloudGetWedaUserId, getIsExitApi, } from '../../../utils/tcb';
+// 新接口没有返回关联表的主列字段，从旧接口中查询出来
+const getPrimaryColumn = (fields, dataViewPropertiesList) => {
+    var _a, _b;
+    const RelationViewList = ((_b = (_a = dataViewPropertiesList === null || dataViewPropertiesList === void 0 ? void 0 : dataViewPropertiesList.Rows) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.RelationViewList) || [];
+    const RelationViewListSchemaList = RelationViewList.map((i) => (i === null || i === void 0 ? void 0 : i.Schema) && JSON.parse(i.Schema));
+    return fields.map((i) => {
+        const item = { ...i };
+        if (item === null || item === void 0 ? void 0 : item['x-parent']) {
+            const schema = RelationViewListSchemaList.find((j) => (j === null || j === void 0 ? void 0 : j['x-parentRelationKey']) === `@${item.name}`);
+            item.parentDatasource = { schema };
+            return item;
+        }
+        else {
+            return item;
+        }
+    });
+};
 // 通过前缀过滤出插槽属性，传入属性是确定的，所以可以通过前缀识别
 export const getSlots = (props) => Object.keys(props).reduce((acc, key) => {
     if (key.startsWith(TABLE_SLOT_PREFIX) || key === GLOBAL_BUTTON) {
@@ -91,12 +108,12 @@ export const getQueryParams = ({ queryParams, wList, viewFieldsData, connectorPa
             ...SearchConfig,
             ConditionConfig,
         ];
-        // 如果设计态存在排序条件并且排序属性未设置
-        if ((viewed === null || viewed === void 0 ? void 0 : viewed.sortItem) && !orderBy && !orderType) {
+        // 如果视图里存在排序设置则以视图为主
+        if (isViewTable && (viewed === null || viewed === void 0 ? void 0 : viewed.sortItem)) {
             params.orderBy = (_a = viewed === null || viewed === void 0 ? void 0 : viewed.sortItem) === null || _a === void 0 ? void 0 : _a.orderBy;
             params.orderType = (_b = viewed === null || viewed === void 0 ? void 0 : viewed.sortItem) === null || _b === void 0 ? void 0 : _b.orderType;
         }
-        // 存在排序属性配置
+        // 非视图存在排序属性配置
         if (!isViewTable && orderBy && orderType) {
             params.orderBy = orderBy;
             params.orderType = orderType;
@@ -218,6 +235,8 @@ export const getViews = async (dbName, selectedView) => {
                     describeRuntimeDataViewPropertiesListStatus) {
                     // 设置字段权限,关联模型字段权限，接口没返回暂不进行校验：['x-viewType']
                     item.fields = (_f = getDataSourceFieldsWithAuth(item.fields, dataViewPropertiesList.ResourceCheckInfos)) === null || _f === void 0 ? void 0 : _f.filter((value) => value.readWriteAuth === 'rw' || value.readWriteAuth === 'r');
+                    // 关联模型的主列字段
+                    item.fields = getPrimaryColumn(item.fields, dataViewPropertiesList);
                 }
                 return item;
             });

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

@@ -11,6 +11,7 @@ import { useEnumContext } from '../../utils/hooks/context';
 import { EnumHoc } from '../../utils/hooks/EnumHoc';
 import { usePlatform, isInIde } from '../../utils/platform';
 import { convertWhere } from '../../utils/getModelParams';
+import isObjectEqual from '../../utils/isObjectEqual';
 import { useAuthFields } from './hooks/useAuthFields';
 import { useDataSourceTitle } from './hooks/useDataSource';
 import { useTableData } from './hooks/useTableData';
@@ -18,7 +19,7 @@ import { useViewFields } from './hooks/useViewFields';
 import { useQueryParams } from './hooks/useQueryParams';
 import { getSlots, getFilterFields, getSelectedView, getSortColumns, mapTableDataWithView, } from './utils';
 import { Mock } from './mock';
-import { getTableColumns, slotRender } from './components/FieldRender';
+import { getTableColumns, slotRender, mapColumKey, } from './components/FieldRender';
 import Modal from '../modal';
 import { WdButton } from '../wd-button';
 const _defaultPageIndex = 1;
@@ -406,7 +407,12 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
     const hasFilterButton = !!filterFieldsData.length;
     const recordKey = isInIde() ? undefined : '_id';
     return (_jsx(ConfigProvider, { classPrefix: classPrefix, children: _jsx(EnumHoc, { fields: authFields, children: _jsxs("div", { className: classNames(wrapClassList, className), style: style, id: id, children: [_jsx(FilterFieldsPanel, { openMobileFilter: openMobileFilter, setOpenMobileFilter: setOpenMobileFilter, filterFields: filterFieldsData, fetchData: (searchValues = []) => {
-                            setQueryParams({ ...queryParams, searchValues, pageIndex: 1 });
+                            if (isObjectEqual(queryParams.searchValues, searchValues)) {
+                                getNewList();
+                            }
+                            else {
+                                setQueryParams({ ...queryParams, searchValues, pageIndex: 1 });
+                            }
                         } }), _jsxs("div", { className: `${classPrefix}-table-container`, children: [!isH5 && !isNoDataSourceBind && (_jsxs("div", { className: `${classPrefix}-table-wrap-toolbar`, children: [enableGlobalButton && (_jsx("div", { className: `${classPrefix}-table-wrap-toolbar__col ${classPrefix}-table-wrap-toolbar__col-start`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) })), (enableRefreshBtn || enableTableHeightSizeBtn) && (_jsx("div", { className: `${classPrefix}-table-wrap-toolbar__col ${classPrefix}-table-wrap-toolbar__col-end`, children: _jsx(ToolBar, { hasFilterButton: hasFilterButton, total: total, refreshTable: refreshTable, setTableHightSize: setTableHightSize, currentSize: tableHightSize, setOpenMobileFilter: () => {
                                                 setOpenMobileFilter(true);
                                             }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination }) }))] })), isH5 &&
@@ -443,7 +449,7 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
                                 } }), isH5 && enableGlobalButton && !isNoDataSourceBind && (_jsx("div", { className: `${classPrefix}-h5-table-wrap-footer`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) }))] }), _jsx(ImportFileModal, { dbName: dbName, datasourceTitle: datasourceTitle, fields: fields, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, isImportFileModalByApiVisible: isImportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, refresh: () => {
                             // 导入成功后刷新页面
                             refreshTable();
-                        } }), _jsx(ExportFileModal, { whereList: wList, fields: fields, columns: columns, isExportFileModalByApiVisible: isExportFileModalByApiVisible, selectedKeys: selectedKeys, dbName: dbName, query: query, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), _jsx(InOrOutRecordModal, { dbName: dbName, isInOrOutRecordModalVisible: isInOrOutRecordModalVisible, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), isH5 && (_jsx(Modal, { className: `${classPrefix}-h5-table-option-modal-wrap`, disableCloseIcon: true, title: "\u64CD\u4F5C", visible: isMobileOptionVisible, outerRef: modalRef, events: {
+                        } }), _jsx(ExportFileModal, { whereList: wList, fields: fields, columns: mapColumKey(columns), isExportFileModalByApiVisible: isExportFileModalByApiVisible, selectedKeys: selectedKeys, dbName: dbName, query: query, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), _jsx(InOrOutRecordModal, { dbName: dbName, isInOrOutRecordModalVisible: isInOrOutRecordModalVisible, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), isH5 && (_jsx(Modal, { className: `${classPrefix}-h5-table-option-modal-wrap`, disableCloseIcon: true, title: "\u64CD\u4F5C", visible: isMobileOptionVisible, outerRef: modalRef, events: {
                             close: () => {
                                 setIsMobileOptionVisible(false);
                             },

package/dist/web/utils/datasource.js

@@ -1,4 +1,5 @@
 import { isInIde, alertErrorMessage, isSystemField } from './platform';
+import { deepClone } from './tool';
 /* **** 数据源相关方法 **** */
 const callWedaApi = (...args) => { var _a, _b; return (_b = (_a = window === null || window === void 0 ? void 0 : window.app) === null || _a === void 0 ? void 0 : _a.cloud) === null || _b === void 0 ? void 0 : _b.callWedaApi(...args); };
 export class DataSource {
@@ -348,7 +349,8 @@ export const resolveFieldsFromDatasource = async ({ dbName, enabledFieldNames, d
 /**
  * 获取主列字段标识并展示主列字段
  */
-export const getPrimaryField = (data) => {
+export const getPrimaryField = (_data) => {
+    const data = deepClone(_data);
     const keys = Object.keys(data).filter((item) => item.includes('@'));
     keys.forEach((item) => {
         var _a, _b, _c, _d, _e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.4.9-alpha.1024",
+  "version": "3.4.10",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -82,7 +82,6 @@
     "object.fromentries": "^2.0.5",
     "prop-types": "^15.7.2",
     "qrcode.react": "^3.1.0",
-    "rc-virtual-list": "^3.4.13",
     "react-easy-swipe": "0.0.22",
     "react-error-boundary": "^3.1.4",
     "react-highlight-within-textarea": "3.1.1",
@@ -170,10 +169,10 @@
     "identity-obj-proxy": "^3.0.0",
     "is-builtin-module": "^3.2.0",
     "jest": "^27.5.1",
+    "jest_workaround": "0.1.14",
     "jest-canvas-mock": "^2.4.0",
     "jest-environment-jsdom": "^27",
     "jest-preview": "^0.2.6",
-    "jest_workaround": "0.1.14",
     "json-schema-to-ts": "^2.5.5",
     "make-fetch-happen": "^11.0.1",
     "miniprogram-simulate": "^1.5.8",