@pisell/materials 1.0.316 → 1.0.318

package/es/components/filter/components/FilterItem/index.js

@@ -7,7 +7,8 @@ var FilterItem = function FilterItem(props) {
   var label = props.label,
     type = props.type,
     name = props.name,
-    other = props.other;
+    other = props.other,
+    isHidden = props.isHidden;
   var Com = useMemo(function () {
     var _fieldMaps;
     return (_fieldMaps = fieldMaps[type]) === null || _fieldMaps === void 0 ? void 0 : _fieldMaps.edit;
@@ -15,6 +16,8 @@ var FilterItem = function FilterItem(props) {
   return /*#__PURE__*/React.createElement(Form.Item, _extends({
     label: label,
     name: name
-  }, (other === null || other === void 0 ? void 0 : other.formItemProps) || {}), /*#__PURE__*/React.createElement(Com, other));
+  }, (other === null || other === void 0 ? void 0 : other.formItemProps) || {}, {
+    hidden: !isHidden
+  }), /*#__PURE__*/React.createElement(Com, other));
 };
 export default FilterItem;

package/es/components/filter/components/QuickFilter/index.js

@@ -28,7 +28,8 @@ var QuickFilter = function QuickFilter(props) {
       ,
       type: item.type,
       other: item.other,
-      props: item.props
+      props: item.props,
+      isHidden: item.isHidden
     });
   }));
 };

package/es/components/filter/types.d.ts

@@ -28,6 +28,7 @@ export declare type FilterItemProps = {
     other: Record<string, any>;
     isCustom?: boolean;
     columnKey?: string;
+    isHidden?: boolean;
 };
 /**
  * 筛选组件属性

package/es/components/sort/index.js

@@ -87,7 +87,9 @@ var Sort = function Sort(_ref2) {
         key: d.name,
         label: d.label,
         children: sortChildrenMap[d.type](d.name, !!(d !== null && d !== void 0 && d.localFilter)),
-        popupClassName: "".concat(prefix, "sort-sub-menu-popup-wrap")
+        popupClassName: "".concat(prefix, "sort-sub-menu-popup-wrap"),
+        // 增加显示隐藏配置
+        className: "".concat(d.isHidden ? "" : "".concat(prefix, "sort-menu-wrap-hide"))
       };
     });
   }, [list, localPagination]);

package/es/components/sort/index.less

@@ -31,4 +31,7 @@
       }
     }
   }
+  &-sort-menu-wrap-hide{
+    display: none!important;
+  }
 }

package/es/components/sort/types.d.ts

@@ -7,6 +7,7 @@ export declare type SortItemProps = {
     isCustom: boolean;
     columnKey?: string;
     localFilter?: boolean;
+    isHidden?: boolean;
 };
 export declare type SortListProps = {
     list: SortItemProps[];

package/es/components/table/Actions/component/ExportImport/components/ExportTable/function.d.ts

@@ -1,6 +1,7 @@
 interface IExportParams {
     type: string;
-    dataSource: any;
+    originDataSource: any[];
+    currentDataSource: any[];
 }
 export declare const batchExport: (exportParams: IExportParams, exportImport: any) => Promise<true | undefined>;
 export {};

package/es/components/table/Actions/component/ExportImport/components/ExportTable/function.js

@@ -54,26 +54,26 @@ export var batchExport = function batchExport(exportParams, exportImport) {
   if (formCode) {
     params.code = formCode;
   }
+  console.log("exportParams", exportParams);
   var type = (exportParams === null || exportParams === void 0 ? void 0 : exportParams.type) || defaultOptions.exportType;
 
   // 当前页面
   if (type === defaultOptions.exportType) {
-    var _exportParams$dataSou;
     _name = "".concat(getText("table-action-export-import-current-page")).concat(_name);
-    var lists = (exportParams === null || exportParams === void 0 ? void 0 : (_exportParams$dataSou = exportParams.dataSource) === null || _exportParams$dataSou === void 0 ? void 0 : _exportParams$dataSou.slice(0, 10)) || [];
+    var lists = (exportParams === null || exportParams === void 0 ? void 0 : exportParams.currentDataSource) || [];
     params.ids = lists.map(function (item) {
       return (item === null || item === void 0 ? void 0 : item.id) || (item === null || item === void 0 ? void 0 : item.form_record_id);
-    }) || [];
+    });
     params.file_name = _name;
   }
 
   // 所有记录
   if (type === "all-records") {
-    var _exportParams$dataSou2;
     _name = "".concat(getText("table-action-export-import-all-records")).concat(_name);
-    params.ids = (exportParams === null || exportParams === void 0 ? void 0 : (_exportParams$dataSou2 = exportParams.dataSource) === null || _exportParams$dataSou2 === void 0 ? void 0 : _exportParams$dataSou2.map(function (item) {
+    var _lists = (exportParams === null || exportParams === void 0 ? void 0 : exportParams.originDataSource) || [];
+    params.ids = _lists.map(function (item) {
       return (item === null || item === void 0 ? void 0 : item.id) || (item === null || item === void 0 ? void 0 : item.form_record_id);
-    })) || [];
+    });
     params.file_name = _name;
   }
 

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

@@ -56,11 +56,10 @@ var ExportImport = function ExportImport(_ref) {
     setErrorStatus = _useState10[1];
   var _useSharedState = useSharedState(Context),
     state = _useSharedState.state;
-  var defaultDataSource = state.dataSource,
-    originDataSource = state.originDataSource;
+  var originResultDataSource = state.originResultDataSource,
+    currentDataSource = state.currentDataSource;
   var context = useEngineContext();
   request.setRequest(context.appHelper.utils.request);
-  console.log(defaultDataSource, originDataSource, "wh77");
   var _items = useMemo(function () {
     // 将对象转成数组
     var result = Object.entries(exportImportOptions).map(function (_ref2) {
@@ -146,7 +145,8 @@ var ExportImport = function ExportImport(_ref) {
             }
             _params = {
               type: type,
-              dataSource: defaultDataSource
+              originDataSource: originResultDataSource,
+              currentDataSource: currentDataSource
             };
             _context.next = 5;
             return batchExport(_params, exportImport);

package/es/components/table/BasicTable/index.js

@@ -15,9 +15,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Table, Form } from "antd";
-import React, { useState, useMemo, useCallback } from "react";
+import React, { useState, useMemo, useCallback, useEffect } from "react";
 import { FormPagination } from "../../Pagination";
 import { calcFilterSort } from "../Table/utils";
+import { useSharedState } from "../../../hooks";
+import { Context } from "../model";
 import { isArr } from "@pisell/utils";
 var BasicTable = function BasicTable(props) {
   var _pagination$pageSizeO;
@@ -43,6 +45,8 @@ var BasicTable = function BasicTable(props) {
     form: form,
     preserve: true
   });
+  var _useSharedState = useSharedState(Context),
+    dispatch = _useSharedState.dispatch;
   var isGroup = useMemo(function () {
     return isArr(group) && group.length > 0;
   }, [group]);
@@ -97,6 +101,12 @@ var BasicTable = function BasicTable(props) {
     });
     return _expandedRowKeys;
   }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
+  useEffect(function () {
+    dispatch({
+      type: "setCurrentDataSource",
+      payload: (_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list) || []
+    });
+  }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, _extends({
     key: defaultExpandedRowKeys.join("-")
   }, other, {

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

@@ -87,6 +87,12 @@ var GridViewTable = function GridViewTable(_ref) {
     rowKey: tableProps.rowKey,
     filter: filter
   });
+  useEffect(function () {
+    dispatch({
+      type: "setOriginResultDataSource",
+      payload: dataSource || []
+    });
+  }, [dataSource]);
   useEffect(function () {
     onDataSourceChange === null || onDataSourceChange === void 0 ? void 0 : onDataSourceChange(dataSource);
   }, [JSON.stringify(dataSource)]);

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

@@ -167,7 +167,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
+}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/es/components/table/model.d.ts

@@ -14,6 +14,8 @@ interface FormState {
     utils: any;
     localPagination: boolean;
     tableWidth: number;
+    currentDataSource: any[];
+    originResultDataSource: any[];
 }
 export declare const Provider: (ComponentUi: any) => (props: any, ref: any) => import("react").JSX.Element, Context: import("react").Context<{
     state: FormState;

package/es/components/table/model.js

@@ -29,7 +29,11 @@ var defaultState = {
       edit: 0
     }
   },
-  tableWidth: 500
+  tableWidth: 500,
+  // 当前页展示的数据
+  currentDataSource: [],
+  // 经过一系列格式化之后的所有数据
+  originResultDataSource: []
 };
 var _getContext = getContext({
     namespace: "state",
@@ -105,6 +109,16 @@ var _getContext = getContext({
         return _objectSpread(_objectSpread({}, state), {}, {
           tableWidth: payload
         });
+      },
+      setCurrentDataSource: function setCurrentDataSource(state, payload) {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          currentDataSource: payload
+        });
+      },
+      setOriginResultDataSource: function setOriginResultDataSource(state, payload) {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          originResultDataSource: payload
+        });
       }
     }
   }),

package/lib/components/filter/components/FilterItem/index.js

@@ -37,11 +37,20 @@ var import_antd = require("antd");
 var import_fields = require("../../../table/Table/fields");
 var import_index = require("./index.less");
 var FilterItem = (props) => {
-  const { label, type, name, other } = props;
+  const { label, type, name, other, isHidden } = props;
   const Com = (0, import_react.useMemo)(() => {
     var _a;
     return (_a = import_fields.fieldMaps[type]) == null ? void 0 : _a.edit;
   }, [type]);
-  return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { label, name, ...(other == null ? void 0 : other.formItemProps) || {} }, /* @__PURE__ */ import_react.default.createElement(Com, { ...other }));
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Form.Item,
+    {
+      label,
+      name,
+      ...(other == null ? void 0 : other.formItemProps) || {},
+      hidden: !isHidden
+    },
+    /* @__PURE__ */ import_react.default.createElement(Com, { ...other })
+  );
 };
 var FilterItem_default = FilterItem;

package/lib/components/filter/components/QuickFilter/index.js

@@ -51,7 +51,8 @@ var QuickFilter = (props) => {
         name,
         type: item.type,
         other: item.other,
-        props: item.props
+        props: item.props,
+        isHidden: item.isHidden
       }
     );
   }));

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

@@ -28,6 +28,7 @@ export declare type FilterItemProps = {
     other: Record<string, any>;
     isCustom?: boolean;
     columnKey?: string;
+    isHidden?: boolean;
 };
 /**
  * 筛选组件属性

package/lib/components/sort/index.js

@@ -102,7 +102,9 @@ var Sort = ({
         key: d.name,
         label: d.label,
         children: sortChildrenMap[d.type](d.name, !!(d == null ? void 0 : d.localFilter)),
-        popupClassName: `${prefix}sort-sub-menu-popup-wrap`
+        popupClassName: `${prefix}sort-sub-menu-popup-wrap`,
+        // 增加显示隐藏配置
+        className: `${d.isHidden ? "" : `${prefix}sort-menu-wrap-hide`}`
       };
     });
   }, [list, localPagination]);
@@ -130,14 +132,7 @@ var Sort = ({
     );
   }, [button, style, value, isMobileBool]);
   const content = (0, import_react.useMemo)(() => {
-    return /* @__PURE__ */ import_react.default.createElement(
-      import_InlineMenu.default,
-      {
-        items: sortItems,
-        value: value || "",
-        onChange
-      }
-    );
+    return /* @__PURE__ */ import_react.default.createElement(import_InlineMenu.default, { items: sortItems, value: value || "", onChange });
   }, [value, sortItems, onChange]);
   if ((0, import_platform.isMobile)()) {
     return /* @__PURE__ */ import_react.default.createElement(

package/lib/components/sort/index.less

@@ -31,4 +31,7 @@
       }
     }
   }
+  &-sort-menu-wrap-hide{
+    display: none!important;
+  }
 }

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

@@ -7,6 +7,7 @@ export declare type SortItemProps = {
     isCustom: boolean;
     columnKey?: string;
     localFilter?: boolean;
+    isHidden?: boolean;
 };
 export declare type SortListProps = {
     list: SortItemProps[];

package/lib/components/table/Actions/component/ExportImport/components/ExportTable/function.d.ts

@@ -1,6 +1,7 @@
 interface IExportParams {
     type: string;
-    dataSource: any;
+    originDataSource: any[];
+    currentDataSource: any[];
 }
 export declare const batchExport: (exportParams: IExportParams, exportImport: any) => Promise<true | undefined>;
 export {};

package/lib/components/table/Actions/component/ExportImport/components/ExportTable/function.js

@@ -40,7 +40,6 @@ var _batchExport = async (params) => {
   }
 };
 var batchExport = (exportParams, exportImport) => {
-  var _a, _b;
   const { selectLists, formId, formCode } = exportImport;
   let _name = (0, import_file.getFileDateName)();
   let params = {};
@@ -50,16 +49,18 @@ var batchExport = (exportParams, exportImport) => {
   if (formCode) {
     params.code = formCode;
   }
+  console.log("exportParams", exportParams);
   const type = (exportParams == null ? void 0 : exportParams.type) || import_status.defaultOptions.exportType;
   if (type === import_status.defaultOptions.exportType) {
     _name = `${(0, import_locales.getText)("table-action-export-import-current-page")}${_name}`;
-    const lists = ((_a = exportParams == null ? void 0 : exportParams.dataSource) == null ? void 0 : _a.slice(0, 10)) || [];
-    params.ids = lists.map((item) => (item == null ? void 0 : item.id) || (item == null ? void 0 : item.form_record_id)) || [];
+    const lists = (exportParams == null ? void 0 : exportParams.currentDataSource) || [];
+    params.ids = lists.map((item) => (item == null ? void 0 : item.id) || (item == null ? void 0 : item.form_record_id));
     params.file_name = _name;
   }
   if (type === "all-records") {
     _name = `${(0, import_locales.getText)("table-action-export-import-all-records")}${_name}`;
-    params.ids = ((_b = exportParams == null ? void 0 : exportParams.dataSource) == null ? void 0 : _b.map((item) => (item == null ? void 0 : item.id) || (item == null ? void 0 : item.form_record_id))) || [];
+    const lists = (exportParams == null ? void 0 : exportParams.originDataSource) || [];
+    params.ids = lists.map((item) => (item == null ? void 0 : item.id) || (item == null ? void 0 : item.form_record_id));
     params.file_name = _name;
   }
   if (type === "selected-records") {

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

@@ -63,10 +63,9 @@ var ExportImport = ({ exportImport }) => {
   const [value, setValue] = (0, import_react.useState)("");
   const [errorStatus, setErrorStatus] = (0, import_react.useState)();
   const { state } = (0, import_hooks.useSharedState)(import_model.Context);
-  const { dataSource: defaultDataSource, originDataSource } = state;
+  const { originResultDataSource, currentDataSource } = state;
   const context = (0, import_useEngineContext.default)();
   import_utils.request.setRequest(context.appHelper.utils.request);
-  console.log(defaultDataSource, originDataSource, "wh77");
   const _items = (0, import_react.useMemo)(() => {
     const result = Object.entries(import_status.exportImportOptions).map(([key, value2]) => {
       return {
@@ -140,7 +139,8 @@ var ExportImport = ({ exportImport }) => {
     if (value === import_status.defaultOptions.exportValue) {
       const _params = {
         type,
-        dataSource: defaultDataSource
+        originDataSource: originResultDataSource,
+        currentDataSource
       };
       const result = await (0, import_function.batchExport)(_params, exportImport);
       if (result) {

package/lib/components/table/BasicTable/index.js

@@ -36,6 +36,8 @@ var import_antd = require("antd");
 var import_react = __toESM(require("react"));
 var import_Pagination = require("../../Pagination");
 var import_utils = require("../Table/utils");
+var import_hooks = require("../../../hooks");
+var import_model = require("../model");
 var import_utils2 = require("@pisell/utils");
 var BasicTable = (props) => {
   var _a;
@@ -48,6 +50,7 @@ var BasicTable = (props) => {
     size: 10
   };
   const group = import_antd.Form.useWatch("group_by", { form, preserve: true });
+  const { dispatch } = (0, import_hooks.useSharedState)(import_model.Context);
   const isGroup = (0, import_react.useMemo)(() => (0, import_utils2.isArr)(group) && group.length > 0, [group]);
   const { showTotal, localPagination } = pagination;
   const _showTotal = (0, import_react.useCallback)(
@@ -103,6 +106,12 @@ var BasicTable = (props) => {
     });
     return _expandedRowKeys;
   }, [_dataSource == null ? void 0 : _dataSource.list]);
+  (0, import_react.useEffect)(() => {
+    dispatch({
+      type: "setCurrentDataSource",
+      payload: (_dataSource == null ? void 0 : _dataSource.list) || []
+    });
+  }, [_dataSource == null ? void 0 : _dataSource.list]);
   return /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Table,
     {

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

@@ -98,6 +98,12 @@ var GridViewTable = ({
     rowKey: tableProps.rowKey,
     filter
   });
+  (0, import_react.useEffect)(() => {
+    dispatch({
+      type: "setOriginResultDataSource",
+      payload: dataSource || []
+    });
+  }, [dataSource]);
   (0, import_react.useEffect)(() => {
     onDataSourceChange == null ? void 0 : onDataSourceChange(dataSource);
   }, [JSON.stringify(dataSource)]);

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

@@ -167,7 +167,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
+}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

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

@@ -14,6 +14,8 @@ interface FormState {
     utils: any;
     localPagination: boolean;
     tableWidth: number;
+    currentDataSource: any[];
+    originResultDataSource: any[];
 }
 export declare const Provider: (ComponentUi: any) => (props: any, ref: any) => import("react").JSX.Element, Context: import("react").Context<{
     state: FormState;

package/lib/components/table/model.js

@@ -59,7 +59,11 @@ var defaultState = {
       edit: 0
     }
   },
-  tableWidth: 500
+  tableWidth: 500,
+  // 当前页展示的数据
+  currentDataSource: [],
+  // 经过一系列格式化之后的所有数据
+  originResultDataSource: []
 };
 var { Provider, Context } = (0, import_miniRedux.default)({
   namespace: "state",
@@ -114,6 +118,12 @@ var { Provider, Context } = (0, import_miniRedux.default)({
     },
     setTableWidth(state, payload) {
       return { ...state, tableWidth: payload };
+    },
+    setCurrentDataSource(state, payload) {
+      return { ...state, currentDataSource: payload };
+    },
+    setOriginResultDataSource(state, payload) {
+      return { ...state, originResultDataSource: payload };
     }
   }
 });

package/lowcode/table/meta.ts

@@ -1810,6 +1810,16 @@ export default {
                         setter: "BoolSetter",
                         defaultValue: false,
                       },
+                      {
+                        name: "isHidden",
+                        title: {
+                          label: "是否隐藏",
+                          tip: "开启时，当前项展示， 关闭时，当前项隐藏",
+                        },
+                        propType: "bool",
+                        setter: "BoolSetter",
+                        defaultValue: true,
+                      },
                       {
                         name: "other",
                         title: {
@@ -1828,6 +1838,7 @@ export default {
                   key: "name",
                   columnKey: "",
                   isCustom: false,
+                  isHidden: true
                 },
               },
             },
@@ -1986,6 +1997,16 @@ export default {
                           return target.parent.getPropValue("isCustom");
                         },
                       },
+                      {
+                        name: "isHidden",
+                        title: {
+                          label: "是否隐藏",
+                          tip: "开启时，当前项展示， 关闭时，当前项隐藏",
+                        },
+                        propType: "bool",
+                        setter: "BoolSetter",
+                        defaultValue: true,
+                      },
                       {
                         name: "type",
                         title: { label: "字段类型", tip: "所排序的字段类型" },
@@ -2021,6 +2042,7 @@ export default {
                   type: "date",
                   columnKey: "",
                   isCustom: false,
+                  isHidden: true
                 },
               },
             },

package/lowcode/table/snippets.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.316",
+  "version": "1.0.318",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -62,9 +62,9 @@
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
+    "@pisell/icon": "0.0.10",
     "@pisell/utils": "1.0.27",
-    "@pisell/date-picker": "1.0.75",
-    "@pisell/icon": "0.0.10"
+    "@pisell/date-picker": "1.0.75"
   },
   "peerDependencies": {
     "react": "^18.0.0",