@pisell/materials 6.5.9 → 6.7.1

package/es/components/sortableList/index.js

@@ -18,13 +18,14 @@ var SortableList = function SortableList(props) {
     activationConstraint: activationConstraint
   }, function (params) {
     var item = params.item,
+      index = params.index,
       p = params.props,
       attributes = params.attributes,
       listeners = params.listeners,
       style = params.style;
     return /*#__PURE__*/React.createElement("div", _extends({}, p, attributes, listeners, {
       style: style
-    }), renderItem === null || renderItem === void 0 ? void 0 : renderItem(item));
+    }), renderItem === null || renderItem === void 0 ? void 0 : renderItem(item, index));
   });
 };
 export default SortableList;

package/es/components/table/Actions/component/ColumnsSetting/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare type ColumnsSettingProps = {
     value?: Record<string, any>[];
     onChange?: (val: Record<string, any>[]) => void;

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

@@ -12,6 +12,12 @@ import { getText } from "../../../../../../../locales/index";
 import { exportData } from "../../../../../serve";
 import { defaultOptions } from "../../../../../status";
 import { getFileDateName } from "../../utils/file";
+var exportImportTypeMap = {
+  'current-page': 'page',
+  'all-records': 'all',
+  'selected-records': 'select'
+};
+
 // 导出接口
 var _batchExport = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
@@ -52,7 +58,8 @@ export var batchExport = function batchExport(exportParams, exportImport) {
     apiUrl = exportImport.apiUrl,
     otherParams = exportImport.otherParams;
   var _name = getFileDateName();
-  var params = _objectSpread({}, otherParams);
+  // 拆分导入导出参数
+  var params = otherParams !== null && otherParams !== void 0 && otherParams.export ? _objectSpread({}, otherParams === null || otherParams === void 0 ? void 0 : otherParams.export) : _objectSpread({}, otherParams);
   params.url = apiUrl === null || apiUrl === void 0 ? void 0 : apiUrl.export;
   console.log("exportParams", exportParams);
   var type = (exportParams === null || exportParams === void 0 ? void 0 : exportParams.type) || defaultOptions.exportType;
@@ -92,6 +99,9 @@ export var batchExport = function batchExport(exportParams, exportImport) {
     params === null || params === void 0 || delete params.shipping_status;
     params === null || params === void 0 || delete params.payment_status;
     params === null || params === void 0 || delete params.status;
+  } else {
+    params === null || params === void 0 || delete params.ids;
   }
+  params.export_select = exportImportTypeMap[type];
   return _batchExport(params);
 };

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

@@ -55,6 +55,10 @@ var ExportImport = function ExportImport(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     errorStatus = _useState10[0],
     setErrorStatus = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    loading = _useState12[0],
+    setLoading = _useState12[1];
   var _useSharedState = useSharedState(Context),
     state = _useSharedState.state;
   var originResultDataSource = state.originResultDataSource,
@@ -147,9 +151,11 @@ var ExportImport = function ExportImport(_ref) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            apiUrl = exportImport.apiUrl, otherParams = exportImport.otherParams; // 导出
+            apiUrl = exportImport.apiUrl, otherParams = exportImport.otherParams;
+            setLoading(true);
+            _context.prev = 2;
             if (!(value === defaultOptions.exportValue)) {
-              _context.next = 9;
+              _context.next = 11;
               break;
             }
             _params = {
@@ -157,41 +163,62 @@ var ExportImport = function ExportImport(_ref) {
               originDataSource: originResultDataSource,
               currentDataSource: currentDataSource
             };
-            _context.next = 5;
+            _context.next = 7;
             return batchExport(_params, exportImport);
-          case 5:
+          case 7:
             result = _context.sent;
             if (result) {
               onCancel();
             }
-            _context.next = 10;
+            _context.next = 24;
             break;
-          case 9:
-            if (value === defaultOptions.importValue) {
-              formData = new FormData();
-              formData.append('file', file);
-              formId = otherParams === null || otherParams === void 0 ? void 0 : otherParams.form_id;
-              formCode = otherParams === null || otherParams === void 0 ? void 0 : otherParams.code;
-              if (formId) {
-                formData.append('form_id', formId);
-              }
-              if (formCode) {
-                formData.append('code', formCode);
-              }
-              formData.append('url', (apiUrl === null || apiUrl === void 0 ? void 0 : apiUrl.export) || '');
-              if (formData) {
-                message.loading({
-                  content: 'Loading...',
-                  key: value
-                });
-                _batchImport.run(formData);
-              }
+          case 11:
+            if (!(value === defaultOptions.importValue)) {
+              _context.next = 24;
+              break;
+            }
+            formData = new FormData();
+            formData.append('file', file);
+            formId = otherParams === null || otherParams === void 0 ? void 0 : otherParams.form_id;
+            formCode = otherParams === null || otherParams === void 0 ? void 0 : otherParams.code;
+            if (formId) {
+              formData.append('form_id', formId);
+            }
+            if (formCode) {
+              formData.append('code', formCode);
+            }
+            formData.append('url', (apiUrl === null || apiUrl === void 0 ? void 0 : apiUrl.import) || '');
+            if (otherParams.import) {
+              Object.entries(otherParams.import).forEach(function (_ref5) {
+                var _ref6 = _slicedToArray(_ref5, 2),
+                  key = _ref6[0],
+                  value = _ref6[1];
+                formData.append(key, value);
+              });
             }
-          case 10:
+            if (!formData) {
+              _context.next = 24;
+              break;
+            }
+            message.loading({
+              content: 'Loading...',
+              key: value
+            });
+            _context.next = 24;
+            return _batchImport.run(formData);
+          case 24:
+            _context.next = 28;
+            break;
+          case 26:
+            _context.prev = 26;
+            _context.t0 = _context["catch"](2);
+          case 28:
+            setLoading(false);
+          case 29:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[2, 26]]);
     }));
     return function onOk() {
       return _ref4.apply(this, arguments);
@@ -226,6 +253,7 @@ var ExportImport = function ExportImport(_ref) {
     onOk: onOk,
     cancelText: getText('table-action-export-import-cancel'),
     okButtonProps: {
+      loading: loading,
       disabled: value === defaultOptions.importValue && (!file || !!errorStatus)
     }
   }, /*#__PURE__*/React.createElement(Content, {

package/es/components/table/Actions/index.d.ts

@@ -0,0 +1,17 @@
+import { FilterType } from "../../filter/types";
+import { ColumnSettingType, DataSourceGroupType, ExportImportType, GallerySettingType, GridViewType, SortType } from "../types";
+import "./index.less";
+declare type ActionsProps = {
+    filter: FilterType;
+    tableId?: string;
+    columnSetting?: ColumnSettingType;
+    dataSourceGroup?: DataSourceGroupType;
+    sort: SortType;
+    localPagination?: boolean;
+    buttons: any[];
+    view: GridViewType;
+    gallery: GallerySettingType;
+    exportImport?: ExportImportType;
+};
+declare const Actions: ({ filter, sort, columnSetting, dataSourceGroup, tableId, localPagination, buttons, view, gallery, exportImport, }: ActionsProps) => JSX.Element | null;
+export default Actions;

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

@@ -28,7 +28,7 @@ var Actions = function Actions(_ref) {
     preserve: true
   });
   var showActions = useMemo(function () {
-    if ( /*#__PURE__*/React.isValidElement(filter)) {
+    if ( /*#__PURE__*/React.isValidElement(filter) || /*#__PURE__*/React.isValidElement(filter === null || filter === void 0 ? void 0 : filter.dom)) {
       return true;
     }
     return (filter === null || filter === void 0 ? void 0 : filter.show) || (sort === null || sort === void 0 ? void 0 : sort.show) || (columnSetting === null || columnSetting === void 0 ? void 0 : columnSetting.show) || (dataSourceGroup === null || dataSourceGroup === void 0 ? void 0 : dataSourceGroup.show) || view.multiple || (exportImport === null || exportImport === void 0 ? void 0 : exportImport.show);
@@ -37,6 +37,9 @@ var Actions = function Actions(_ref) {
     if ( /*#__PURE__*/React.isValidElement(filter)) {
       return filter;
     }
+    if ( /*#__PURE__*/React.isValidElement(filter === null || filter === void 0 ? void 0 : filter.dom)) {
+      return filter.dom;
+    }
     return /*#__PURE__*/React.createElement(Filter, {
       filter: filter,
       isRenderFormContent: false,

package/es/components/table/Gallery/components/VirtualGrid/useGapSize.d.ts

@@ -1,5 +1,5 @@
 declare const useGapSize: (gap: number | number[]) => {
-    horizontal: any;
-    vertical: any;
+    horizontal: number;
+    vertical: number;
 };
 export default useGapSize;

package/es/components/table/Summary/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Summary: ({ summary }: any) => JSX.Element | null;
 export default Summary;

package/es/components/table/Table/fields/date/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/date/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/date/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/es/components/table/Table/fields/image/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/image/Show/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/es/components/table/Table/fields/image/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const fieldMaps: {
     text: {
         field: {

package/es/components/table/Table/fields/link/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/link/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/link/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: {
     field: {
         field_icon: string;

package/es/components/table/Table/fields/number/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/number/Show/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/es/components/table/Table/fields/number/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/number/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/es/components/table/Table/fields/numberRange/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/numberRange/Show/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/es/components/table/Table/fields/numberRange/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/numberRange/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/es/components/table/Table/fields/oldRangePicker/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/oldRangePicker/Show/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/es/components/table/Table/fields/oldRangePicker/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/oldRangePicker/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/es/components/table/Table/fields/pSwitch/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/pSwitch/Show/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/es/components/table/Table/fields/pSwitch/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/rangePicker/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/rangePicker/Show/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/es/components/table/Table/fields/rangePicker/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/rangePicker/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/es/components/table/Table/fields/search/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/search/Show/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/es/components/table/Table/fields/search/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/search/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/es/components/table/Table/fields/select/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/select/Show/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/es/components/table/Table/fields/select/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/select/filterUtil/index.d.ts

@@ -2,4 +2,4 @@ export default function ({ value, key, item, }: {
     value: string | string[];
     key: string | string[];
     item: Record<string, any>;
-}): any;
+}): boolean;

package/es/components/table/Table/fields/select/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/es/components/table/Table/fields/text/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/text/Show/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 import "./index.less";
 declare const Show: (props: FieldPropsType) => JSX.Element;

package/es/components/table/Table/fields/text/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/text/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/es/components/table/Table/fields/treeSelect/Config/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/treeSelect/Show/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/es/components/table/Table/fields/treeSelect/Sort/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/treeSelect/filterUtil/index.d.ts

@@ -2,4 +2,4 @@ export default function ({ value, key, item, }: {
     value: string | string[] | Record<string, any>[];
     key: string | string[];
     item: Record<string, any>;
-}): any;
+}): boolean;

package/es/components/table/Table/fields/treeSelect/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

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

@@ -57,11 +57,14 @@ var GridViewTable = function GridViewTable(_ref) {
       payload: newData
     });
   });
-  var handleResize = function handleResize(index) {
+  var handleResize = function handleResize(index, record) {
     return function (e, _ref2) {
       var size = _ref2.size;
-      var nextColumns = _toConsumableArray(columns);
-      nextColumns[index] = _objectSpread(_objectSpread({}, nextColumns[index]), {}, {
+      var findIndex = column_setting.findIndex(function (item) {
+        return item.dataIndex === record.dataIndex;
+      });
+      var nextColumns = _toConsumableArray(column_setting);
+      nextColumns[findIndex] = _objectSpread(_objectSpread({}, nextColumns[findIndex]), {}, {
         width: size.width
       });
       form.setFieldValue('column_setting', nextColumns);
@@ -97,6 +100,7 @@ var GridViewTable = function GridViewTable(_ref) {
   var components = useGenTableComponents({
     form: form
   });
+  console.log(columns, 'columns12');
   var showTotal = useCallback(function (total, range, pageSize) {
     var start = range[0] - 1;
     var _current = start / pageSize + 1;

package/es/components/table/Table/tableConfig/summary/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const summary: (props: any) => JSX.Element;
 export default summary;

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

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filters" | "column_setting" | "gallery_setting" | "order_by" | "group_by" | "filter_setting" | "view_mode")[];
+}) => ("filters" | "column_setting" | "gallery_setting" | "order_by" | "group_by" | "view_mode" | "filter_setting")[];
 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/TableFilter/SortIcon.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface SortIconProps {
     sortOrder: null | "ascend" | "descend";
 }

package/es/components/table/hooks/useTableSetting.js

@@ -231,8 +231,8 @@ var useTableSetting = function useTableSetting(params) {
         }
       } else {
         var names = new Set();
-        if ( /*#__PURE__*/React.isValidElement(filter)) {
-          names = new Set(((filter === null || filter === void 0 ? void 0 : filter.__items) || []).filter(function (item) {
+        if ( /*#__PURE__*/React.isValidElement(filter) || /*#__PURE__*/React.isValidElement(filter === null || filter === void 0 ? void 0 : filter.dom)) {
+          names = new Set(((filter === null || filter === void 0 ? void 0 : filter.items) || []).filter(function (item) {
             return !item.isHidden;
           }).map(function (item) {
             var rawName = item === null || item === void 0 ? void 0 : item.value;

package/es/components/table/hooks/useTransColumns.d.ts

@@ -4,7 +4,7 @@ declare type UseTransColumnsProps = {
     form: FormInstance;
     localPagination: boolean;
     handleSave?: (row: Record<string, any>) => void;
-    handleResize?: (index: number) => (e: any, p2: any) => void;
+    handleResize?: (index: number, record: Record<string, any>) => (e: any, p2: any) => void;
     dragSort: boolean;
     bordered: boolean;
 };

package/es/components/table/hooks/useTransColumns.js

@@ -186,7 +186,7 @@ var useTransColumns = function useTransColumns(params) {
           return _objectSpread(_objectSpread({
             record: record
           }, item), {}, {
-            onResize: handleResize === null || handleResize === void 0 ? void 0 : handleResize(index),
+            onResize: handleResize === null || handleResize === void 0 ? void 0 : handleResize(index, record),
             position: position
           });
         }

package/es/components/table/index.js

@@ -252,7 +252,9 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
         try {
           if (!tableId) return {};
           var setting = getTableSettingByCurrentViewMode(tableId, currentViewMode);
-          return (setting === null || setting === void 0 ? void 0 : setting.filters) || {};
+          var filters = (setting === null || setting === void 0 ? void 0 : setting.filters) || {};
+          filters.order_by = (setting === null || setting === void 0 ? void 0 : setting.order_by) || '';
+          return filters;
         } catch (e) {
           return {};
         }

package/es/components/table/serve.js

@@ -26,6 +26,14 @@ var defaultUrl = {
  * @Date: 2024-09-05 12:01
  */
 var formatApiParams = function formatApiParams(params, type) {
+  if (params instanceof FormData) {
+    var url = params.get('url');
+    params.delete('url');
+    return {
+      url: url || (defaultUrl === null || defaultUrl === void 0 ? void 0 : defaultUrl[type]),
+      params: params
+    };
+  }
   var _url = (params === null || params === void 0 ? void 0 : params.url) || (defaultUrl === null || defaultUrl === void 0 ? void 0 : defaultUrl[type]);
   var _params = _objectSpread({}, params);
   delete _params.url;