@pisell/materials 1.0.306 → 1.0.307

package/es/components/table/Table/utils.d.ts

@@ -13,7 +13,16 @@ export declare const mergeColumnSetting: ({ columns, tableId, currentViewMode, }
     columns: Record<string, any>[];
     tableId?: string | undefined;
     currentViewMode: ModeType;
-}) => Record<string, any>[];
+}) => {
+    isShow: boolean;
+}[] | ({
+    width: any;
+    isShow: any;
+    sortIndex: number;
+} | {
+    isShow: boolean;
+    sortIndex: number;
+})[];
 /**
  * 对数据源进行排序
  * @param dataSource 数据源数组

package/es/components/table/Table/utils.js

@@ -121,7 +121,11 @@ export var mergeColumnSetting = function mergeColumnSetting(_ref3) {
   var columns = _ref3.columns,
     tableId = _ref3.tableId,
     currentViewMode = _ref3.currentViewMode;
-  if (!tableId) return columns;
+  if (!tableId) return columns.map(function (item) {
+    return _objectSpread(_objectSpread({}, item), {}, {
+      isShow: true
+    });
+  });
   var colKeyMap = getColumnsFromLocalStorage(tableId, currentViewMode);
   var newColumns = columns.map(function (item, index) {
     var col = colKeyMap[item.key];

package/es/components/table/index.js

@@ -110,17 +110,9 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     }
     return viewMode || defaultViewMode;
   }, [viewMode, defaultViewMode, multiple]);
-  var removeTitleColumns = useMemo(function () {
-    var _columns = columns.map(function (item) {
-      return _objectSpread(_objectSpread({}, item), {}, {
-        title: undefined
-      });
-    });
-    return _columns;
-  }, [columns]);
   var currentSettingHash = useMemo(function () {
-    return currentSettingKey || getHash(removeTitleColumns) || "";
-  }, [currentSettingKey, JSON.stringify(removeTitleColumns)]);
+    return currentSettingKey || getHash(columns) || "";
+  }, [currentSettingKey, JSON.stringify(columns)]);
   useEffect(function () {
     var setting = getTableSettingFromLocalStorage(tableId);
     if (setting.currentSettingHash !== currentSettingHash) {
@@ -240,7 +232,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     form.setFieldValue("column_setting", {});
     form.setFieldValue("column_setting", tableSettingRef.current.column_setting);
     // JSON.stringify会丢失 render函数变更的监听 使用自定义stringify处理
-  }, [stringify(removeTitleColumns)]);
+  }, [stringify(columns)]);
   useEffect(function () {
     form.setFieldsValue(initialValuesRef.current);
     // ArraySetter在面板state变更时指针改变

package/es/components/virtual-keyboard/Time/index.js

@@ -1,7 +1,7 @@
 import React, { useMemo, useEffect } from "react";
 import VirtualKeyboard from "../index";
 import "./index.less";
-import { formatStringToTime } from "./utils.js";
+import { formatStringToTime } from "./utils.tsx";
 import { getText } from "../../../locales";
 import dayjs from "dayjs";
 var items = [{

package/lib/components/table/Table/utils.d.ts

@@ -13,7 +13,16 @@ export declare const mergeColumnSetting: ({ columns, tableId, currentViewMode, }
     columns: Record<string, any>[];
     tableId?: string | undefined;
     currentViewMode: ModeType;
-}) => Record<string, any>[];
+}) => {
+    isShow: boolean;
+}[] | ({
+    width: any;
+    isShow: any;
+    sortIndex: number;
+} | {
+    isShow: boolean;
+    sortIndex: number;
+})[];
 /**
  * 对数据源进行排序
  * @param dataSource 数据源数组

package/lib/components/table/Table/utils.js

@@ -153,7 +153,10 @@ var mergeColumnSetting = ({
   currentViewMode
 }) => {
   if (!tableId)
-    return columns;
+    return columns.map((item) => ({
+      ...item,
+      isShow: true
+    }));
   const colKeyMap = getColumnsFromLocalStorage(tableId, currentViewMode);
   const newColumns = columns.map((item, index) => {
     const col = colKeyMap[item.key];

package/lib/components/table/index.js

@@ -122,18 +122,9 @@ var GridView = (0, import_model.Provider)(
       }
       return viewMode || defaultViewMode;
     }, [viewMode, defaultViewMode, multiple]);
-    const removeTitleColumns = (0, import_react.useMemo)(() => {
-      let _columns = columns.map((item) => {
-        return {
-          ...item,
-          title: void 0
-        };
-      });
-      return _columns;
-    }, [columns]);
     const currentSettingHash = (0, import_react.useMemo)(() => {
-      return currentSettingKey || (0, import_utils.getHash)(removeTitleColumns) || "";
-    }, [currentSettingKey, JSON.stringify(removeTitleColumns)]);
+      return currentSettingKey || (0, import_utils.getHash)(columns) || "";
+    }, [currentSettingKey, JSON.stringify(columns)]);
     (0, import_react.useEffect)(() => {
       const setting = (0, import_utils.getTableSettingFromLocalStorage)(tableId);
       if (setting.currentSettingHash !== currentSettingHash) {
@@ -255,7 +246,7 @@ var GridView = (0, import_model.Provider)(
         "column_setting",
         tableSettingRef.current.column_setting
       );
-    }, [(0, import_utils.stringify)(removeTitleColumns)]);
+    }, [(0, import_utils.stringify)(columns)]);
     (0, import_react.useEffect)(() => {
       form.setFieldsValue(initialValuesRef.current);
     }, [JSON.stringify(propsFilter)]);

package/lowcode/list/meta.ts

@@ -575,7 +575,7 @@ export default {
             tip: 'header | 列表头部',
           },
           propType: 'node',
-          setter: {
+          setter: [{
             componentName: 'SlotSetter',
             initialValue: {
               type: 'JSSlot',
@@ -588,7 +588,7 @@ export default {
                 },
               ],
             },
-          },
+          }],
         },
         {
           name: 'footer',
@@ -597,7 +597,7 @@ export default {
             tip: 'footer | 列表底部',
           },
           propType: 'node',
-          setter: {
+          setter: [{
             componentName: 'SlotSetter',
             initialValue: {
               type: 'JSSlot',
@@ -610,7 +610,7 @@ export default {
                 },
               ],
             },
-          },
+          }],
         },
         {
           name: 'loadMore',
@@ -619,7 +619,7 @@ export default {
             tip: 'loadMore | 加载更多',
           },
           propType: 'node',
-          setter: {
+          setter: [{
             componentName: 'SlotSetter',
             initialValue: {
               type: 'JSSlot',
@@ -632,7 +632,7 @@ export default {
                 },
               ],
             },
-          },
+          }],
         },
       ],
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.306",
+  "version": "1.0.307",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",