@pisell/materials 1.0.225 → 1.0.227

package/es/components/table/index.js

@@ -36,7 +36,7 @@ var defaultView = {
   modeList: []
 };
 var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context$appHelper, _other$pagination2, _other$pagination5, _other$pagination6, _other$pagination7, _other$pagination9;
+  var _context$appHelper, _other$pagination2, _other$pagination5, _other$pagination6, _other$pagination8;
   var dataSource = props.dataSource,
     columns = props.columns,
     dispatch = props.dispatch,
@@ -66,6 +66,8 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
   });
   var context = useEngineContext();
   var wrapRef = useRef(null);
+  var tableSettingRef = useRef({});
+  var filterDefaultRef = useRef({});
   var initialValuesRef = useRef({});
   var utils = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils;
   var tableId = useMemo(function () {
@@ -169,7 +171,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
       document.body.id = "body";
     }, 200);
   }, [filter]);
-  var initialValues = useMemo(function () {
+  var filterDefaultValues = useMemo(function () {
     var _other$pagination3, _other$pagination4;
     var defaultValues = ((filter === null || filter === void 0 ? void 0 : filter.list) || []).reduce(function (p, c) {
       var _c$other;
@@ -180,12 +182,11 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
         size: ((_other$pagination4 = other.pagination) === null || _other$pagination4 === void 0 ? void 0 : _other$pagination4.pageSize) || 10
       }
     });
-    // if (other?.pagination?.localPagination) {
-    defaultValues = _objectSpread(_objectSpread({}, defaultValues), tableSetting);
-    // }
     return defaultValues;
-  }, [filter === null || filter === void 0 ? void 0 : filter.list, (_other$pagination5 = other.pagination) === null || _other$pagination5 === void 0 ? void 0 : _other$pagination5.localPagination, tableSetting, (_other$pagination6 = other.pagination) === null || _other$pagination6 === void 0 ? void 0 : _other$pagination6.current, (_other$pagination7 = other.pagination) === null || _other$pagination7 === void 0 ? void 0 : _other$pagination7.pageSize]);
-  initialValuesRef.current = initialValues;
+  }, [JSON.stringify(filter === null || filter === void 0 ? void 0 : filter.list), (_other$pagination5 = other.pagination) === null || _other$pagination5 === void 0 ? void 0 : _other$pagination5.current, (_other$pagination6 = other.pagination) === null || _other$pagination6 === void 0 ? void 0 : _other$pagination6.pageSize]);
+  filterDefaultRef.current = filterDefaultValues;
+  tableSettingRef.current = tableSetting;
+  initialValuesRef.current = _objectSpread(_objectSpread({}, filterDefaultValues), tableSetting);
   useImperativeHandle(ref, function () {
     if (wrapRef.current) {
       wrapRef.current.formInstance = form;
@@ -194,22 +195,18 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     return wrapRef.current;
   });
   useEffect(function () {
-    // 当前视图变更时重置form
+    // 当前视图变更时重置form tableSetting 及 筛选项默认值全部重置
     form.resetFields();
     form.setFieldsValue(initialValuesRef.current);
   }, [currentViewMode]);
-
-  // useEffect(() => {
-  //   // 如果是编辑态修改columns时重置form
-  //   if (props.__designMode === "design") {
-  //     form.resetFields();
-  //     form.setFieldsValue(initialValuesRef.current);
-  //   }
-  // }, [JSON.stringify(columns), props.__designMode]);
-
+  useEffect(function () {
+    // 虚拟表columns由接口获取 columns变更时只重新设置tableSetting
+    form.setFieldsValue(tableSettingRef.current);
+  }, [JSON.stringify(columns)]);
   useEffect(function () {
     form.setFieldsValue(initialValuesRef.current);
-  }, [propsFilter]);
+    // ArraySetter在面板state变更时指针改变
+  }, [JSON.stringify(propsFilter)]);
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     layout: "vertical",
@@ -223,9 +220,9 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
           page: 1
         });
       } else {
-        var _other$pagination8;
+        var _other$pagination7;
         // 如果使用本地分页 不执行onValuesChange
-        if (other !== null && other !== void 0 && (_other$pagination8 = other.pagination) !== null && _other$pagination8 !== void 0 && _other$pagination8.localPagination) {
+        if (other !== null && other !== void 0 && (_other$pagination7 = other.pagination) !== null && _other$pagination7 !== void 0 && _other$pagination7.localPagination) {
           return;
         }
       }
@@ -259,7 +256,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     filter: filter,
     sort: sort,
     tableId: tableId,
-    localPagination: other === null || other === void 0 ? void 0 : (_other$pagination9 = other.pagination) === null || _other$pagination9 === void 0 ? void 0 : _other$pagination9.localPagination,
+    localPagination: other === null || other === void 0 ? void 0 : (_other$pagination8 = other.pagination) === null || _other$pagination8 === void 0 ? void 0 : _other$pagination8.localPagination,
     gallery: gallery
   }), /*#__PURE__*/React.createElement(Summary, {
     summary: summary

package/lib/components/table/index.js

@@ -55,7 +55,7 @@ var defaultView = {
 };
 var GridView = (0, import_model.Provider)(
   (0, import_react.forwardRef)((props, ref) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     const {
       dataSource,
       columns,
@@ -81,6 +81,8 @@ var GridView = (0, import_model.Provider)(
     const viewMode = import_antd.Form.useWatch("view_mode", { form, preserve: true });
     const context = (0, import_useEngineContext.default)();
     const wrapRef = (0, import_react.useRef)(null);
+    const tableSettingRef = (0, import_react.useRef)({});
+    const filterDefaultRef = (0, import_react.useRef)({});
     const initialValuesRef = (0, import_react.useRef)({});
     const utils = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils;
     const tableId = (0, import_react.useMemo)(() => {
@@ -176,9 +178,9 @@ var GridView = (0, import_model.Provider)(
         document.body.id = "body";
       }, 200);
     }, [filter]);
-    const initialValues = (0, import_react.useMemo)(() => {
+    const filterDefaultValues = (0, import_react.useMemo)(() => {
       var _a2, _b2;
-      let defaultValues = ((filter == null ? void 0 : filter.list) || []).reduce(
+      const defaultValues = ((filter == null ? void 0 : filter.list) || []).reduce(
         (p, c) => {
           var _a3;
           return {
@@ -193,19 +195,18 @@ var GridView = (0, import_model.Provider)(
           }
         }
       );
-      defaultValues = {
-        ...defaultValues,
-        ...tableSetting
-      };
       return defaultValues;
     }, [
-      filter == null ? void 0 : filter.list,
-      (_c = other.pagination) == null ? void 0 : _c.localPagination,
-      tableSetting,
-      (_d = other.pagination) == null ? void 0 : _d.current,
-      (_e = other.pagination) == null ? void 0 : _e.pageSize
+      JSON.stringify(filter == null ? void 0 : filter.list),
+      (_c = other.pagination) == null ? void 0 : _c.current,
+      (_d = other.pagination) == null ? void 0 : _d.pageSize
     ]);
-    initialValuesRef.current = initialValues;
+    filterDefaultRef.current = filterDefaultValues;
+    tableSettingRef.current = tableSetting;
+    initialValuesRef.current = {
+      ...filterDefaultValues,
+      ...tableSetting
+    };
     (0, import_react.useImperativeHandle)(ref, () => {
       if (wrapRef.current) {
         wrapRef.current.formInstance = form;
@@ -216,9 +217,12 @@ var GridView = (0, import_model.Provider)(
       form.resetFields();
       form.setFieldsValue(initialValuesRef.current);
     }, [currentViewMode]);
+    (0, import_react.useEffect)(() => {
+      form.setFieldsValue(tableSettingRef.current);
+    }, [JSON.stringify(columns)]);
     (0, import_react.useEffect)(() => {
       form.setFieldsValue(initialValuesRef.current);
-    }, [propsFilter]);
+    }, [JSON.stringify(propsFilter)]);
     return /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form,
       {
@@ -266,7 +270,7 @@ var GridView = (0, import_model.Provider)(
           filter,
           sort,
           tableId,
-          localPagination: (_f = other == null ? void 0 : other.pagination) == null ? void 0 : _f.localPagination,
+          localPagination: (_e = other == null ? void 0 : other.pagination) == null ? void 0 : _e.localPagination,
           gallery
         }
       ), /* @__PURE__ */ import_react.default.createElement(import_Summary.default, { summary }), /* @__PURE__ */ import_react.default.createElement(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.225",
+  "version": "1.0.227",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,8 +61,8 @@
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.20",
     "@pisell/utils": "1.0.23",
-    "@pisell/icon": "0.0.8",
-    "@pisell/date-picker": "1.0.68"
+    "@pisell/date-picker": "1.0.68",
+    "@pisell/icon": "0.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",