@pisell/materials 6.0.14 → 6.0.16

package/lib/components/dataSourceComponents/dataSourceForm/utils.js

@@ -35,6 +35,7 @@ __export(utils_exports, {
   getNestedValue: () => getNestedValue,
   isValidDomain: () => isValidDomain,
   renderValueWithMap: () => renderValueWithMap,
+  setFormFieldsUntouched: () => setFormFieldsUntouched,
   toArr: () => toArr,
   transformFormObjToArrayWithUntouched: () => transformFormObjToArrayWithUntouched,
   withDataSource: () => withDataSource,
@@ -54,6 +55,7 @@ var import_useFormSetting = __toESM(require("./provider/hooks/useFormSetting"));
 var import_useJsonPrefixPath = __toESM(require("./provider/hooks/useJsonPrefixPath"));
 var import_DataSourceProvider = __toESM(require("../provider/dataSource/DataSourceProvider"));
 var import_useTranslationOriginal = __toESM(require("../../../hooks/useTranslationOriginal"));
+var import_useVariables = __toESM(require("../hooks/useVariables"));
 var import_style = require("./style.less");
 var withMode = (FieldComponent, ReadPrettyComponent, transformProps) => {
   return ({ renderMode = "edit", value, onChange, ...props }) => {
@@ -89,7 +91,9 @@ var formItemNameReverse = (name) => {
   return name.replace(new RegExp(FORM_ITEM_SPLIT_CHAR, "g"), ".");
 };
 var isValidDomain = (value) => {
-  return /^(?!.*--)[A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9](\.[A-Za-z]{2,})+$/.test(value);
+  return /^(?!.*--)[A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9](\.[A-Za-z]{2,})+$/.test(
+    value
+  );
 };
 var withFormItem = (WrappedComponent, overlayProps) => {
   return ({
@@ -187,8 +191,8 @@ var withFormItem = (WrappedComponent, overlayProps) => {
                 return Promise.resolve();
               }
               try {
-                const cleanedNumber2 = value.replace(/\s|\(|\)/g, "");
-                const parsedNumber = (0, import_libphonenumber_js.parsePhoneNumberFromString)(cleanedNumber2);
+                const cleanedNumber = value.replace(/\s|\(|\)/g, "");
+                const parsedNumber = (0, import_libphonenumber_js.parsePhoneNumberFromString)(cleanedNumber);
                 if (!(parsedNumber == null ? void 0 : parsedNumber.isValid())) {
                   return Promise.reject(
                     new Error(
@@ -214,16 +218,16 @@ var withFormItem = (WrappedComponent, overlayProps) => {
                 return Promise.resolve();
               }
               try {
-                const cleanedNumber2 = value.replace(/\s|\(|\)/g, "");
-                if (cleanedNumber2.length > 15) {
+                const cleanedNumber = value.replace(/\s|\(|\)/g, "");
+                if (cleanedNumber.length > 15) {
                   return Promise.reject(
                     new Error(
                       typeobj.message || (0, import_locales.getText)("pisell-data-source-form-mobile-message")
                     )
                   );
                 }
-                if (cleanedNumber2.startsWith("+61")) {
-                  const numberWithoutPrefix = cleanedNumber2.slice(3);
+                if (cleanedNumber.startsWith("+61")) {
+                  const numberWithoutPrefix = cleanedNumber.slice(3);
                   if (!/^(?:04\d{8}|4\d{8})$/.test(numberWithoutPrefix)) {
                     return Promise.reject(
                       new Error(
@@ -231,8 +235,8 @@ var withFormItem = (WrappedComponent, overlayProps) => {
                       )
                     );
                   }
-                } else if (cleanedNumber2.startsWith("+86")) {
-                  const numberWithoutPrefix = cleanedNumber2.slice(3);
+                } else if (cleanedNumber.startsWith("+86")) {
+                  const numberWithoutPrefix = cleanedNumber.slice(3);
                   if (!/^1[3-9]\d{9}$/.test(numberWithoutPrefix)) {
                     return Promise.reject(
                       new Error(
@@ -243,6 +247,7 @@ var withFormItem = (WrappedComponent, overlayProps) => {
                 }
                 return Promise.resolve();
               } catch (error) {
+                const cleanedNumber = value.replace(/\s|\(|\)/g, "");
                 if (cleanedNumber.length > 15) {
                   return Promise.reject(
                     new Error(
@@ -255,6 +260,12 @@ var withFormItem = (WrappedComponent, overlayProps) => {
             }
           });
           break;
+        case "url":
+          rules.push({
+            ...typeobj,
+            message: typeobj.message || (0, import_locales.getText)("pisell-data-source-form-url-message")
+          });
+          break;
         case "subdomain":
           rules.push({
             validator: (_, value) => {
@@ -285,6 +296,49 @@ var withFormItem = (WrappedComponent, overlayProps) => {
             }
           });
           break;
+        case "appIdentifier":
+          rules.push({
+            validator: (_, value) => {
+              if (!value)
+                return Promise.resolve();
+              if (!/^[a-z0-9\-\._]+$/.test(value)) {
+                return Promise.reject(
+                  new Error(
+                    (0, import_locales.getText)("pisell-data-source-form-app-identifier-pattern")
+                  )
+                );
+              }
+              if (!/^[a-z]/.test(value)) {
+                return Promise.reject(
+                  new Error(
+                    (0, import_locales.getText)(
+                      "pisell-data-source-form-app-identifier-start-with-letter"
+                    )
+                  )
+                );
+              }
+              if (/[\-\._]$/.test(value)) {
+                return Promise.reject(
+                  new Error(
+                    (0, import_locales.getText)(
+                      "pisell-data-source-form-app-identifier-special-ends"
+                    )
+                  )
+                );
+              }
+              if (/[\-]{2,}|[\.]{2,}|[\_]{2,}/.test(value)) {
+                return Promise.reject(
+                  new Error(
+                    (0, import_locales.getText)(
+                      "pisell-data-source-form-app-identifier-consecutive-special"
+                    )
+                  )
+                );
+              }
+              return Promise.resolve();
+            }
+          });
+          break;
       }
     }
     if (maxLengthobj && maxLengthobj.enabled) {
@@ -364,6 +418,14 @@ var withFormItem = (WrappedComponent, overlayProps) => {
       }
       return propsLabelCol;
     }, [hideLabel, propsLabelCol]);
+    const otherFormItemProps = (0, import_react.useMemo)(() => {
+      if ((0, import_utils.isFunction)(overlayProps == null ? void 0 : overlayProps.otherFormItemProps)) {
+        return overlayProps == null ? void 0 : overlayProps.otherFormItemProps(otherProps, {
+          rules
+        });
+      }
+      return (overlayProps == null ? void 0 : overlayProps.otherFormItemProps) || {};
+    }, [overlayProps == null ? void 0 : overlayProps.otherFormItemProps, otherProps]);
     return /* @__PURE__ */ import_react.default.createElement(
       import_form.default.Item,
       {
@@ -388,7 +450,7 @@ var withFormItem = (WrappedComponent, overlayProps) => {
         className: (0, import_classnames.default)("pisell-data-source-form-item", {
           "pisell-data-source-form-item-view": effectiveMode === "view"
         }),
-        ...overlayProps == null ? void 0 : overlayProps.otherFormItemProps
+        ...otherFormItemProps
       },
       renderComponent
     );
@@ -397,7 +459,18 @@ var withFormItem = (WrappedComponent, overlayProps) => {
 var withDataSource = (WrappedComponent) => {
   return (props) => {
     const { dataSource } = props;
-    return /* @__PURE__ */ import_react.default.createElement(import_DataSourceProvider.default, { dataSource }, /* @__PURE__ */ import_react.default.createElement(WrappedComponent, { ...props }));
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_DataSourceProvider.default,
+      {
+        dataSource,
+        requestOptions: {
+          list: {
+            cacheKey: `${dataSource == null ? void 0 : dataSource.headerDataSource}-${dataSource == null ? void 0 : dataSource.name}-${dataSource == null ? void 0 : dataSource.tableName}`
+          }
+        }
+      },
+      /* @__PURE__ */ import_react.default.createElement(WrappedComponent, { ...props })
+    );
   };
 };
 var withOptions = (WrappedComponent) => {
@@ -408,14 +481,28 @@ var withOptions = (WrappedComponent) => {
       options: propsOptions,
       optionSourceType,
       labelField,
-      valueField
+      valueField,
+      extraParams
     } = props;
-    const { list } = (0, import_useDataSource.default)();
+    const { parseVariable } = (0, import_useVariables.default)();
+    const { list, getCurrentRecord } = (0, import_useDataSource.default)();
+    const parseParams = (0, import_react.useMemo)(() => {
+      const params = {};
+      if (extraParams) {
+        Object.keys(extraParams).forEach((key) => {
+          params[key] = parseVariable == null ? void 0 : parseVariable(extraParams[key], {
+            currentRecord: getCurrentRecord()
+          });
+        });
+      }
+      return params;
+    }, [extraParams]);
     (0, import_react.useEffect)(() => {
       if (optionSourceType === "api") {
         list.run({
           page: 1,
-          pageSize: 200
+          pageSize: 500,
+          ...parseParams
         });
       }
     }, []);
@@ -424,7 +511,10 @@ var withOptions = (WrappedComponent) => {
       if (optionSourceType !== "api") {
         return propsOptions;
       }
-      return (((_c = (_b = (_a2 = list.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.filter) == null ? void 0 : _c.call(_b, (item) => !["draft", "inactive", "disabled"].includes(item == null ? void 0 : item.status))) || []).map((item) => ({
+      return (((_c = (_b = (_a2 = list.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.filter) == null ? void 0 : _c.call(
+        _b,
+        (item) => !["draft", "inactive", "disabled"].includes(item == null ? void 0 : item.status)
+      )) || []).map((item) => ({
         label: translationOriginal(item[labelField]),
         value: item[valueField]
       })) || [];
@@ -454,7 +544,7 @@ var renderValueWithMap = (value, valueMap, renderMode) => {
       },
       valueMap == null ? void 0 : valueMap[item]
     ), index < value.length - 1 && ", ")));
-  } else if ((0, import_utils.isString)(value)) {
+  } else if ((0, import_utils.isString)(value) || (0, import_utils.isNumber)(value)) {
     return /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-form-read-pretty-text" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-form-read-pretty-value", style: textStyle }, (valueMap == null ? void 0 : valueMap[value]) || value));
   }
   return null;
@@ -484,6 +574,17 @@ var transformFormObjToArrayWithUntouched = (obj) => {
     return acc;
   }, []);
 };
+var setFormFieldsUntouched = (form) => {
+  const fieldsErrorArray = form.getFieldsError();
+  const fields = fieldsErrorArray.map((item) => {
+    return {
+      name: item.name,
+      value: form.getFieldValue(item.name),
+      touched: false
+    };
+  });
+  form.setFields(fields);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   filterSystemFields,
@@ -492,6 +593,7 @@ var transformFormObjToArrayWithUntouched = (obj) => {
   getNestedValue,
   isValidDomain,
   renderValueWithMap,
+  setFormFieldsUntouched,
   toArr,
   transformFormObjToArrayWithUntouched,
   withDataSource,

package/lib/components/dataSourceComponents/dataSourceTable/BaseTable.d.ts

@@ -1,4 +1,8 @@
 import React from 'react';
 import { DataSourceTableProps } from './type';
-declare const BaseTable: (props: DataSourceTableProps) => React.JSX.Element;
-export default BaseTable;
+export interface TableRef {
+    refreshCurrentPage: () => void;
+    refreshData: () => void;
+}
+declare const _default: React.ForwardRefExoticComponent<DataSourceTableProps & React.RefAttributes<TableRef>>;
+export default _default;

package/lib/components/dataSourceComponents/dataSourceTable/BaseTable.js

@@ -45,7 +45,13 @@ var import_useDataSource = __toESM(require("../hooks/useDataSource"));
 var import_TableSettingProvider = __toESM(require("./provider/tableSetting/TableSettingProvider"));
 var import_useDataSourceKey = __toESM(require("./hooks/useDataSourceKey"));
 var import_useTableProps = __toESM(require("./hooks/useTableProps"));
-var BaseTable = (props) => {
+var mockData = {
+  count: 1,
+  data: [{}],
+  page: 1,
+  pageSize: 10
+};
+var BaseTable = (props, ref) => {
   const {
     columns: propsColumns,
     dataSource,
@@ -55,8 +61,15 @@ var BaseTable = (props) => {
   const tableRef = (0, import_react.useRef)(null);
   const componentId = (0, import_useComponentId.default)(props);
   const { registerValueVariable } = (0, import_useVariables.default)();
-  const { list } = (0, import_useDataSource.default)();
-  const { data } = list;
+  const { list, __designMode } = (0, import_useDataSource.default)();
+  const { data: originData } = list;
+  const data = (0, import_react.useMemo)(() => {
+    var _a;
+    if (__designMode === "design" && !((_a = originData == null ? void 0 : originData.data) == null ? void 0 : _a.length)) {
+      return mockData;
+    }
+    return originData;
+  }, [originData, __designMode]);
   const { dataSourceKey, dataSourceKeyRef } = (0, import_useDataSourceKey.default)();
   const beforeClose = (0, import_react.useRef)();
   const setBeforeClose = (0, import_react.useCallback)((fn) => {
@@ -71,7 +84,7 @@ var BaseTable = (props) => {
     Container,
     drawerContent
   } = (0, import_useDrawerState.default)(operationContent);
-  const { queryPageConfig, handleValuesChange, refreshData, handleFilterChange } = (0, import_useTableQuery.default)(props);
+  const { queryPageConfig, handleValuesChange, refreshData, handleFilterChange, refreshCurrentPage } = (0, import_useTableQuery.default)(props);
   const handleAllValuesChange = (changedValues, values) => {
     var _a;
     (_a = props == null ? void 0 : props.onValuesChange) == null ? void 0 : _a.call(props, changedValues, values);
@@ -119,6 +132,15 @@ var BaseTable = (props) => {
     handleFilterChange,
     tableRef
   });
+  (0, import_react.useImperativeHandle)(ref, () => {
+    if (tableRef.current) {
+      tableRef.current.dataSourceTable = {
+        refreshCurrentPage,
+        refreshData
+      };
+    }
+    return tableRef.current;
+  });
   return /* @__PURE__ */ import_react.default.createElement(import_TableSettingProvider.default, null, /* @__PURE__ */ import_react.default.createElement(
     import_table.default,
     {
@@ -151,4 +173,4 @@ var BaseTable = (props) => {
     )
   ));
 };
-var BaseTable_default = BaseTable;
+var BaseTable_default = (0, import_react.forwardRef)(BaseTable);

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useColumns.js

@@ -39,9 +39,7 @@ var genFieldProps = (field, fieldProps) => {
     renderMode: "tableView",
     noStyle: true
   };
-  if (!field)
-    return props;
-  if (["Select", "Radio.Group", "Checkbox.Group"].includes(
+  if (field && ["Select", "Radio.Group", "Checkbox.Group"].includes(
     field.uiSchema["x-component"]
   ) && field.uiSchema.enum.length > 0) {
     if (["Radio.Group", "Checkbox.Group"].includes(field.uiSchema["x-component"])) {
@@ -76,7 +74,10 @@ var useColumns = ({
       const field = fieldMap[column == null ? void 0 : column.dataIndex];
       const title = (column == null ? void 0 : column.title) || (field == null ? void 0 : field.title);
       const FieldComponent = (0, import_fields.getFieldComponent)(column == null ? void 0 : column.fieldComponent) || "div";
-      const fieldProps = genFieldProps(field, (_a = column.other) == null ? void 0 : _a.fieldProps);
+      const fieldProps = genFieldProps(
+        field,
+        (_a = column.other) == null ? void 0 : _a.fieldProps
+      );
       return {
         ...column,
         title,

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useFormat.js

@@ -36,11 +36,63 @@ var import_ahooks = require("ahooks");
 var import_utils = require("../../fields/utils");
 var import_utils2 = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
+var filterOperatorArr = [
+  "$eq",
+  "$ne",
+  "$is",
+  "$not",
+  "$col",
+  "$in",
+  "$notIn",
+  "$empty",
+  "$notEmpty",
+  "$and",
+  "$or",
+  "$isFalsy",
+  "$isTruly",
+  "$gt",
+  "$gte",
+  "$lt",
+  "$lte",
+  "$between",
+  "$notBetween",
+  "$includes",
+  "$notIncludes",
+  "$startsWith",
+  "$notStatsWith",
+  "$endsWith",
+  "$notEndsWith",
+  "$like",
+  "$notLike",
+  "$iLike",
+  "$notILike",
+  "$regexp",
+  "$notRegexp",
+  "$iRegexp",
+  "$notIRegexp",
+  "$dateOn",
+  "$dateNotOn",
+  "$dateBefore",
+  "$dateNotBefore",
+  "$dateAfter",
+  "$dateNotAfter",
+  "$match",
+  "$notMatch",
+  "$anyOf",
+  "$noneOf",
+  "$arrayEmpty",
+  "$arrayNotEmpty",
+  "$exists",
+  "$notExists"
+];
 var formatFilter = (filterValue, fields) => {
   const conditions = [];
   if (!filterValue || !(fields == null ? void 0 : fields.length)) {
     return JSON.stringify({});
   }
+  if ((0, import_utils2.isString)(filterValue)) {
+    return filterValue;
+  }
   if (filterValue._keywords) {
     const keywordFields = fields.filter((item) => ["string", "number", "text"].includes(item.type)).map((item) => ({
       [item.name]: {
@@ -65,6 +117,12 @@ var formatFilter = (filterValue, fields) => {
     if (key === "_keywords" || value === void 0 || value === null || value === "" || (0, import_utils2.isArr)(value) && value.length === 0) {
       return;
     }
+    if ((0, import_utils2.isString)(value) && filterOperatorArr.some((item) => value.includes(item))) {
+      if ((0, import_utils2.isJson)(value)) {
+        conditions.push({ [key]: JSON.parse(value) });
+      }
+      return;
+    }
     const field = fieldsMap[key];
     if (!((_a = field == null ? void 0 : field.uiSchema) == null ? void 0 : _a["x-component"])) {
       return;

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -43,11 +43,16 @@ declare const useTableProps: (props: UseTablePropsProps) => {
     } | undefined;
     operation?: {
         show: boolean;
-        title: string;
+        title: string; /**
+         * 处理table的props
+         * 转换title
+         * @param props
+         * @returns
+         */
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {
@@ -65,7 +70,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "large" | "middle";
+        openContentSize: "small" | "middle" | "large";
         openTitle: string;
         key: string;
     } | undefined;

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.js

@@ -45,6 +45,7 @@ var import_useDataSource = __toESM(require("../../hooks/useDataSource"));
 var import_pisellToast = __toESM(require("../../../pisellToast"));
 var import_locales = require("../../../../locales");
 var import_pisellModal = __toESM(require("../../../pisellModal"));
+var import_dayjs = __toESM(require("dayjs"));
 var useTableProps = (props) => {
   var _a;
   const {
@@ -77,7 +78,7 @@ var useTableProps = (props) => {
     type
   } = operation || {};
   const componentId = (0, import_useComponentId.default)(originProps);
-  const { list, destroy } = (0, import_useDataSource.default)();
+  const { list, destroy, update } = (0, import_useDataSource.default)();
   const { data } = list;
   const pagination = (0, import_usePagination.default)({ data });
   (0, import_react.useEffect)(() => {
@@ -112,26 +113,35 @@ var useTableProps = (props) => {
     });
     openDrawer(item);
   });
-  const handleDelete = (0, import_ahooks.useMemoizedFn)(async (record) => {
-    try {
-      registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
-        currentRecord: record
-      });
-      setTimeout(async () => {
-        destroy == null ? void 0 : destroy.runAsync(record.id).then(() => {
+  const handleDelete = (0, import_ahooks.useMemoizedFn)(
+    async (record, softDelete) => {
+      try {
+        registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
+          currentRecord: { ...record }
+        });
+        setTimeout(async () => {
+          if (softDelete) {
+            const deleteTime = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+            await (update == null ? void 0 : update.runAsync({
+              ...record,
+              deleted_at: deleteTime
+            }));
+          } else {
+            await (destroy == null ? void 0 : destroy.runAsync(record.id));
+          }
           refreshData();
           (0, import_pisellToast.default)({
             content: (0, import_locales.getText)("pisell-action-delete-success")
           });
         });
-      });
-    } catch (error) {
-      console.error(error);
-      (0, import_pisellToast.default)({
-        content: (0, import_locales.getText)("pisell-action-delete-failed")
-      });
+      } catch (error) {
+        console.error(error);
+        (0, import_pisellToast.default)({
+          content: (0, import_locales.getText)("pisell-action-delete-failed")
+        });
+      }
     }
-  });
+  );
   const actionsColumns = (0, import_react.useMemo)(() => {
     if (!show) {
       return [];
@@ -148,7 +158,8 @@ var useTableProps = (props) => {
         render: (_, record) => {
           return /* @__PURE__ */ import_react.default.createElement(import_antd.Space, null, items == null ? void 0 : items.map((item) => {
             const { label, actionType, show: show2 } = item;
-            const handleClick = () => {
+            const handleClick = (e) => {
+              e.stopPropagation();
               if (actionType === "delete") {
                 import_pisellModal.default.confirm({
                   title: (0, import_locales.getText)("pisell-delete-confirm-title"),
@@ -156,7 +167,7 @@ var useTableProps = (props) => {
                   okText: (0, import_locales.getText)("pisell-delete-confirm-ok"),
                   cancelText: (0, import_locales.getText)("pisell-delete-confirm-cancel"),
                   onOk: () => {
-                    handleDelete(record);
+                    handleDelete(record, item == null ? void 0 : item.softDelete);
                   }
                 });
                 return;
@@ -180,8 +191,11 @@ var useTableProps = (props) => {
                 onClick: handleClick,
                 type: type === "link" ? "link" : "default",
                 style: type === "link" ? {
-                  padding: "0"
-                } : {}
+                  padding: "0",
+                  height: "auto"
+                } : {
+                  height: "auto"
+                }
               },
               label
             );
@@ -206,6 +220,8 @@ var useTableProps = (props) => {
       return {
         ...button,
         ...buttonProps,
+        title: button.label,
+        size: "large",
         onClick: () => {
           if (actionType === "add") {
             let result = true;

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableQuery.d.ts

@@ -28,5 +28,6 @@ declare const useTableQuery: (props: DataSourceTableProps) => {
     handleValuesChange: (params: Params, allParams: Params) => void;
     refreshData: () => void;
     handleFilterChange: (changedFields: any, allFields: any) => void;
+    refreshCurrentPage: () => void;
 };
 export default useTableQuery;

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableQuery.js

@@ -72,12 +72,18 @@ var useTableQuery = (props) => {
       page: 1
     }));
   });
+  const refreshCurrentPage = (0, import_ahooks.useMemoizedFn)(() => {
+    setQueryPageConfig((prev) => ({
+      ...prev
+    }));
+  });
   return {
     queryPageConfig,
     setQueryPageConfig,
     handleValuesChange,
     refreshData,
-    handleFilterChange
+    handleFilterChange,
+    refreshCurrentPage
   };
 };
 var useTableQuery_default = useTableQuery;

package/lib/components/dataSourceComponents/dataSourceTable/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
+import { TableRef } from './BaseTable';
 import './index.less';
 import { DataSourceTableProps } from './type';
-declare const DataSourceTable: (props: DataSourceTableProps) => React.JSX.Element;
-export default DataSourceTable;
+declare const _default: React.ForwardRefExoticComponent<DataSourceTableProps & React.RefAttributes<TableRef>>;
+export default _default;

package/lib/components/dataSourceComponents/dataSourceTable/index.js

@@ -36,8 +36,8 @@ var import_react = __toESM(require("react"));
 var import_BaseTable = __toESM(require("./BaseTable"));
 var import_DataSourceProvider = __toESM(require("../provider/dataSource/DataSourceProvider"));
 var import_index = require("./index.less");
-var DataSourceTable = (props) => {
+var DataSourceTable = (props, ref) => {
   const { dataSource, __designMode, extraParams } = props;
-  return /* @__PURE__ */ import_react.default.createElement(import_DataSourceProvider.default, { dataSource, __designMode, extraParams }, /* @__PURE__ */ import_react.default.createElement(import_BaseTable.default, { ...props }));
+  return /* @__PURE__ */ import_react.default.createElement(import_DataSourceProvider.default, { dataSource, __designMode, extraParams }, /* @__PURE__ */ import_react.default.createElement(import_BaseTable.default, { ...props, ref }));
 };
-var dataSourceTable_default = DataSourceTable;
+var dataSourceTable_default = (0, import_react.forwardRef)(DataSourceTable);

package/lib/components/dataSourceComponents/fields/DatePicker/index.js

@@ -34,11 +34,20 @@ __export(DatePicker_exports, {
 module.exports = __toCommonJS(DatePicker_exports);
 var import_utils = require("../../dataSourceForm/utils");
 var import_WithMode = __toESM(require("./WithMode"));
+var import_dayjs = __toESM(require("dayjs"));
 var DatePicker = (0, import_utils.withFormItem)(import_WithMode.default, {
   innerProps: {
     style: {
       width: "100%"
     }
+  },
+  otherFormItemProps: (props) => {
+    return {
+      normalize: (value) => value && (0, import_dayjs.default)(value).format(props.submitFormat || "YYYY-MM-DD"),
+      getValueProps: (value) => ({
+        value: value && (0, import_dayjs.default)(value)
+      })
+    };
   }
 });
 var DatePicker_default = DatePicker;

package/lib/components/dataSourceComponents/fields/IconSelect/ReadPretty.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { IconSelectProps } from './type';
+import './ReadPretty.less';
+declare const IconSelectReadPretty: (props: IconSelectProps) => React.JSX.Element | null;
+export default IconSelectReadPretty;