@pisell/materials 2.2.3 → 2.2.5

package/lib/components/table/Actions/component/ExportImport/index.js

@@ -48,6 +48,7 @@ var import_function = require("./components/ExportTable/function");
 var import_ImportLog = __toESM(require("./components/ImportLog"));
 var import_ImportTable = __toESM(require("./components/ImportTable"));
 var import_hooks = require("../../../../../hooks");
+var import_locale = require("../../../../../utils/locale");
 var import_model = require("../../../model");
 var import_index = require("./index.less");
 var Com = {
@@ -57,6 +58,7 @@ var Com = {
   import_log: import_ImportLog.default
 };
 var ExportImport = ({ exportImport }) => {
+  var _a, _b;
   const [open, setOpen] = (0, import_react.useState)(false);
   const [file, setFile] = (0, import_react.useState)(null);
   const [type, setType] = (0, import_react.useState)(import_status.defaultOptions.exportType);
@@ -65,7 +67,7 @@ var ExportImport = ({ exportImport }) => {
   const { state } = (0, import_hooks.useSharedState)(import_model.Context);
   const { originResultDataSource, currentDataSource } = state;
   const context = (0, import_useEngineContext.default)();
-  import_utils.request.setRequest(context.appHelper.utils.request);
+  import_utils.request.setRequest((_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.request);
   const _items = (0, import_react.useMemo)(() => {
     const result = Object.entries(import_status.exportImportOptions).map(([key, value2]) => {
       return {
@@ -76,10 +78,9 @@ var ExportImport = ({ exportImport }) => {
     return result;
   }, []);
   const Content = (0, import_react.useMemo)(() => {
-    if (!value)
-      return null;
-    return Com[value];
-  }, [value]);
+    const _value = value || import_status.defaultOptions.importValue;
+    return Com[_value];
+  }, [value, import_status.defaultOptions.importValue]);
   const _footer = (0, import_react.useMemo)(() => {
     const types = import_status.defaultOptions.footerHintTypes;
     if (types.includes(value)) {
@@ -94,8 +95,10 @@ var ExportImport = ({ exportImport }) => {
     if (!value)
       return null;
     const types = import_status.defaultOptions.okShowButtonTypes;
+    const lang = (0, import_locale.getCurrentLocale)();
+    const isEn = lang === "en-US" || lang === "en";
     if (types.includes(value) && (exportImport == null ? void 0 : exportImport.title)) {
-      return `${import_status.exportImportOptions[value]}${exportImport.title}`;
+      return `${import_status.exportImportOptions[value]}${isEn ? " " : ""}${exportImport.title}`;
     }
     return import_status.exportImportOptions[value];
   }, [value, exportImport == null ? void 0 : exportImport.title]);

package/lib/components/table/Actions/component/Group/PopoverContent.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import "./PopoverContent.less";
+import React from 'react';
+import './PopoverContent.less';
 declare type FieldType = string | number;
 export declare type GroupValue = {
     field: FieldType;

package/lib/components/table/Actions/component/Group/PopoverContent.js

@@ -53,7 +53,8 @@ var PopoverContent = (props) => {
     ]);
   };
   const options = (0, import_react.useMemo)(() => {
-    return (columns || []).map((item) => ({
+    const _lists = (columns || []).filter((item) => !(item == null ? void 0 : item.isHidden));
+    return _lists.map((item) => ({
       label: item.label,
       value: `${item.name}`
     }));

package/lib/components/table/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

package/lib/components/table/index.js

@@ -76,6 +76,7 @@ var GridView = (0, import_model.Provider)(
       currentSettingKey,
       // pagination,
       exportImport,
+      currentComponentId,
       ...other
     } = props;
     const modal = (0, import_hooks.useSharedState)(import_model.Context);
@@ -90,11 +91,12 @@ var GridView = (0, import_model.Provider)(
     const { width } = (0, import_ahooks.useSize)(wrapRef) || {};
     const utils = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils;
     const tableId = (0, import_react.useMemo)(() => {
+      console.log(props, "wh");
       if (props.__designMode === "design") {
         return "designMode-mock-table-id";
       }
-      return props.__id;
-    }, [props.__id, props.__designMode]);
+      return (props == null ? void 0 : props.currentComponentId) || props.__id;
+    }, [props.__id, props.__designMode, props == null ? void 0 : props.currentComponentId]);
     const columns = (0, import_react.useMemo)(() => {
       return propsColumns.filter((item) => !item.hidden);
     }, [propsColumns]);

package/lib/components/table/types.d.ts

@@ -26,6 +26,7 @@ declare type DataSourceListItemType = {
     columnKey?: string;
     label?: string;
     name?: string | string[];
+    isHidden?: boolean;
 };
 /**
  * 数据源分组总配置
@@ -211,7 +212,11 @@ export declare type GridViewProps = {
     /**
      * 当前本地配置的key 用此hash是否改变用来判断是否清空本地配置 不填默认使用columns数据生成hash
      */
-    currentSettingKey?: "";
+    currentSettingKey?: string;
+    /**
+    * 当前本地配置的唯一值, 不填默认使用currentSettingKey
+    */
+    currentComponentId?: string;
     /**
      * 当前表格中数据发生变化事件 包含本地筛选和外部传入数据变化
      * @param currentDataSource

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

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(Time_exports);
 var import_react = __toESM(require("react"));
 var import__ = __toESM(require("../index"));
 var import_index = require("./index.less");
-var import_utils = require("./utils.tsx");
+var import_utils = require("./utils");
 var import_locales = require("../../../locales");
 var import_dayjs = __toESM(require("dayjs"));
 var items = [

package/lowcode/table/meta.ts

@@ -81,6 +81,15 @@ export default {
           },
           propType: "string",
           setter: "StringSetter",
+        },
+        {
+          name: "currentComponentId",
+          title: {
+            label: "currentComponentId",
+            tip: "currentComponentId | 当前本地配置的唯一值 不填默认使用currentSettingKey",
+          },
+          propType: "string",
+          setter: "StringSetter",
         }
       ],
     },
@@ -1518,6 +1527,16 @@ export default {
                         setter: "BoolSetter",
                         defaultValue: false,
                       },
+                      {
+                        name: "isHidden",
+                        title: {
+                          label: "是否隐藏",
+                          tip: "开启时，当前项展示， 关闭时，当前项隐藏",
+                        },
+                        propType: "bool",
+                        setter: "BoolSetter",
+                        defaultValue: false,
+                      },
                       {
                         name: "columnKey",
                         title: {
@@ -1586,6 +1605,7 @@ export default {
                   name: "",
                   columnKey: "",
                   isCustom: false,
+                  isHidden: false
                 },
               },
             },
@@ -1810,6 +1830,16 @@ export default {
                         setter: "BoolSetter",
                         defaultValue: false,
                       },
+                      {
+                        name: "isHidden",
+                        title: {
+                          label: "是否隐藏",
+                          tip: "开启时，当前项展示， 关闭时，当前项隐藏",
+                        },
+                        propType: "bool",
+                        setter: "BoolSetter",
+                        defaultValue: false,
+                      },
                       {
                         name: "other",
                         title: {
@@ -1828,6 +1858,7 @@ export default {
                   key: "name",
                   columnKey: "",
                   isCustom: false,
+                  isHidden: false
                 },
               },
             },
@@ -1986,6 +2017,16 @@ export default {
                           return target.parent.getPropValue("isCustom");
                         },
                       },
+                      {
+                        name: "isHidden",
+                        title: {
+                          label: "是否隐藏",
+                          tip: "开启时，当前项展示， 关闭时，当前项隐藏",
+                        },
+                        propType: "bool",
+                        setter: "BoolSetter",
+                        defaultValue: false,
+                      },
                       {
                         name: "type",
                         title: { label: "字段类型", tip: "所排序的字段类型" },
@@ -2021,6 +2062,7 @@ export default {
                   type: "date",
                   columnKey: "",
                   isCustom: false,
+                  isHidden: false
                 },
               },
             },

package/lowcode/table/snippets.ts

@@ -330,12 +330,14 @@ export default [
               type: "string",
               columnKey: "name",
               isCustom: false,
+              isHidden: false
             },
             {
               label: "标题",
               type: "number",
               columnKey: "age",
               isCustom: false,
+              isHidden: false
             },
           ],
         },
@@ -348,12 +350,14 @@ export default [
               name: "",
               columnKey: "name",
               isCustom: false,
+              isHidden: false
             },
             {
               label: "标题",
               name: "",
               columnKey: "age",
               isCustom: false,
+              isHidden: false
             },
           ],
         },
@@ -371,6 +375,7 @@ export default [
               isCustom: false,
               sort: true,
               localFilter: true,
+              isHidden: false
             },
             {
               label: "标题",
@@ -380,6 +385,7 @@ export default [
               isCustom: false,
               sort: true,
               localFilter: true,
+              isHidden: false
             },
           ],
         },

package/package.json

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