@pisell/materials 6.2.40 → 6.2.41

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

@@ -63,6 +63,7 @@ var ExportImport = ({ exportImport }) => {
   const [type, setType] = (0, import_react.useState)(import_status.defaultOptions.exportType);
   const [value, setValue] = (0, import_react.useState)("");
   const [errorStatus, setErrorStatus] = (0, import_react.useState)();
+  const [loading, setLoading] = (0, import_react.useState)(false);
   const { state } = (0, import_hooks.useSharedState)(import_model.Context);
   const { originResultDataSource, currentDataSource } = state;
   const context = (0, import_useEngineContext.default)();
@@ -142,33 +143,43 @@ var ExportImport = ({ exportImport }) => {
   });
   const onOk = async () => {
     const { apiUrl, otherParams } = exportImport;
-    if (value === import_status.defaultOptions.exportValue) {
-      const _params = {
-        type,
-        originDataSource: originResultDataSource,
-        currentDataSource
-      };
-      const result = await (0, import_function.batchExport)(_params, exportImport);
-      if (result) {
-        onCancel();
-      }
-    } else if (value === import_status.defaultOptions.importValue) {
-      const formData = new FormData();
-      formData.append("file", file);
-      const formId = otherParams == null ? void 0 : otherParams.form_id;
-      const formCode = otherParams == null ? void 0 : otherParams.code;
-      if (formId) {
-        formData.append("form_id", formId);
-      }
-      if (formCode) {
-        formData.append("code", formCode);
-      }
-      formData.append("url", (apiUrl == null ? void 0 : apiUrl.export) || "");
-      if (formData) {
-        import_antd.message.loading({ content: "Loading...", key: value });
-        _batchImport.run(formData);
+    setLoading(true);
+    try {
+      if (value === import_status.defaultOptions.exportValue) {
+        const _params = {
+          type,
+          originDataSource: originResultDataSource,
+          currentDataSource
+        };
+        const result = await (0, import_function.batchExport)(_params, exportImport);
+        if (result) {
+          onCancel();
+        }
+      } else if (value === import_status.defaultOptions.importValue) {
+        const formData = new FormData();
+        formData.append("file", file);
+        const formId = otherParams == null ? void 0 : otherParams.form_id;
+        const formCode = otherParams == null ? void 0 : otherParams.code;
+        if (formId) {
+          formData.append("form_id", formId);
+        }
+        if (formCode) {
+          formData.append("code", formCode);
+        }
+        formData.append("url", (apiUrl == null ? void 0 : apiUrl.import) || "");
+        if (otherParams.import) {
+          Object.entries(otherParams.import).forEach(([key, value2]) => {
+            formData.append(key, value2);
+          });
+        }
+        if (formData) {
+          import_antd.message.loading({ content: "Loading...", key: value });
+          await _batchImport.run(formData);
+        }
       }
+    } catch (error) {
     }
+    setLoading(false);
   };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Dropdown,
@@ -196,6 +207,7 @@ var ExportImport = ({ exportImport }) => {
       onOk,
       cancelText: (0, import_locales.getText)("table-action-export-import-cancel"),
       okButtonProps: {
+        loading,
         disabled: value === import_status.defaultOptions.importValue && (!file || !!errorStatus)
       }
     },

package/lib/components/table/Actions/component/GallerySetting/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { GallerySettingType, ModeType } from "../../../types";
 import "./index.less";
 declare type GallerySettingProps = {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './PopoverContent.less';
 declare type FieldType = string | number;
 export declare type GroupValue = {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DataSourceGroupType } from "../../../types";
 declare type GroupProps = {
     setting: DataSourceGroupType;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FilterType } from "../../filter/types";
 import { ColumnSettingType, DataSourceGroupType, ExportImportType, GallerySettingType, GridViewType, SortType } from "../types";
 import "./index.less";

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

@@ -63,7 +63,7 @@ var Actions = ({
     preserve: true
   });
   const showActions = (0, import_react.useMemo)(() => {
-    if (import_react.default.isValidElement(filter)) {
+    if (import_react.default.isValidElement(filter) || import_react.default.isValidElement(filter == null ? void 0 : filter.dom)) {
       return true;
     }
     return (filter == null ? void 0 : filter.show) || (sort == null ? void 0 : sort.show) || (columnSetting == null ? void 0 : columnSetting.show) || (dataSourceGroup == null ? void 0 : dataSourceGroup.show) || view.multiple || (exportImport == null ? void 0 : exportImport.show);
@@ -79,6 +79,9 @@ var Actions = ({
     if (import_react.default.isValidElement(filter)) {
       return filter;
     }
+    if (import_react.default.isValidElement(filter == null ? void 0 : filter.dom)) {
+      return filter.dom;
+    }
     return /* @__PURE__ */ import_react.default.createElement(
       import_filter.default,
       {

package/lib/components/table/Gallery/components/GalleryItem/components/Cover/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { GallerySettingType, GallerySettingValueType } from "../../../../../types";
 declare type CoverProps = {
     cover?: GallerySettingType["cover"];

package/lib/components/table/Gallery/components/GalleryItem/components/Title/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { GallerySettingType } from "../../../../../types";
 import "./index.less";
 declare type TitleProps = GallerySettingType["title"] & {

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

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

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

@@ -0,0 +1,3 @@
+import React from "react";
+declare const AddFieldModal: React.FC;
+export default AddFieldModal;

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

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

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

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

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

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

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

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

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

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

package/lib/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/lib/components/table/Table/fields/image/Sort/index.d.ts

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

package/lib/components/table/Table/fields/image/index.d.ts

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const fieldMaps: {
     text: {
         field: {
@@ -197,12 +198,12 @@ export declare const fieldList: ({
     field_icon: string;
     field_name: string;
     field_type: string;
-    default_value: string;
+    default_value: boolean;
 } | {
     field_icon: string;
     field_name: string;
     field_type: string;
-    default_value: boolean;
+    default_value: string;
 } | {
     field_icon: string;
     field_name: string;

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

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

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

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

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

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

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

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

package/lib/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/lib/components/table/Table/fields/number/Sort/index.d.ts

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

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

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

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

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

package/lib/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/lib/components/table/Table/fields/numberRange/Sort/index.d.ts

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

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

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

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

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

package/lib/components/table/Table/fields/oldRangePicker/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/lib/components/table/Table/fields/oldRangePicker/Sort/index.d.ts

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

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

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

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

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

package/lib/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/lib/components/table/Table/fields/pSwitch/Sort/index.d.ts

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

package/lib/components/table/Table/fields/pSwitch/index.d.ts

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

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

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

package/lib/components/table/Table/fields/rangePicker/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/lib/components/table/Table/fields/rangePicker/Sort/index.d.ts

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

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

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

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

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

package/lib/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/lib/components/table/Table/fields/search/Sort/index.d.ts

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

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

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

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

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

package/lib/components/table/Table/fields/select/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/lib/components/table/Table/fields/select/Sort/index.d.ts

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

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

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

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

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

package/lib/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/lib/components/table/Table/fields/text/Sort/index.d.ts

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

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

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

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

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

package/lib/components/table/Table/fields/treeSelect/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/lib/components/table/Table/fields/treeSelect/Sort/index.d.ts

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

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

@@ -71,10 +71,13 @@ var GridViewTable = ({
       payload: newData
     });
   });
-  const handleResize = (index) => (e, { size }) => {
-    const nextColumns = [...columns];
-    nextColumns[index] = {
-      ...nextColumns[index],
+  const handleResize = (index, record) => (e, { size }) => {
+    const findIndex = column_setting.findIndex(
+      (item) => item.dataIndex === record.dataIndex
+    );
+    const nextColumns = [...column_setting];
+    nextColumns[findIndex] = {
+      ...nextColumns[findIndex],
       width: size.width
     };
     form.setFieldValue("column_setting", nextColumns);
@@ -108,6 +111,7 @@ var GridViewTable = ({
   const components = (0, import_useGenTableComponents.default)({
     form
   });
+  console.log(columns, "columns12");
   const showTotal = (0, import_react.useCallback)(
     (total, range, pageSize) => {
       let start = range[0] - 1;

package/lib/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" | "filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("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/lib/components/table/TableFilter/SortIcon.d.ts

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

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

@@ -268,9 +268,9 @@ var useTableSetting = (params) => {
         }
       } else {
         let names = /* @__PURE__ */ new Set();
-        if (import_react2.default.isValidElement(filter)) {
+        if (import_react2.default.isValidElement(filter) || import_react2.default.isValidElement(filter == null ? void 0 : filter.dom)) {
           names = new Set(
-            ((filter == null ? void 0 : filter.__items) || []).filter((item) => !item.isHidden).map((item) => {
+            ((filter == null ? void 0 : filter.items) || []).filter((item) => !item.isHidden).map((item) => {
               const rawName = item == null ? void 0 : item.value;
               if (!rawName) return void 0;
               return Array.isArray(rawName) ? rawName.join(",") : String(rawName);

package/lib/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/lib/components/table/hooks/useTransColumns.js

@@ -196,7 +196,7 @@ var useTransColumns = (params) => {
         onHeaderCell: (record) => ({
           record,
           ...item,
-          onResize: handleResize == null ? void 0 : handleResize(index),
+          onResize: handleResize == null ? void 0 : handleResize(index, record),
           position
         })
       };

package/lib/components/table/index.js

@@ -266,7 +266,9 @@ var GridView = (0, import_model.Provider)(
           try {
             if (!tableId) return {};
             const setting = (0, import_utils.getTableSettingByCurrentViewMode)(tableId, currentViewMode);
-            return (setting == null ? void 0 : setting.filters) || {};
+            const filters = (setting == null ? void 0 : setting.filters) || {};
+            filters.order_by = (setting == null ? void 0 : setting.order_by) || "";
+            return filters;
           } catch (e) {
             return {};
           }

package/lib/components/table/serve.js

@@ -35,6 +35,14 @@ var defaultUrl = {
   template: "/shop/form/data/download-template"
 };
 var formatApiParams = (params, type) => {
+  if (params instanceof FormData) {
+    let url = params.get("url");
+    params.delete("url");
+    return {
+      url: url || (defaultUrl == null ? void 0 : defaultUrl[type]),
+      params
+    };
+  }
   const _url = (params == null ? void 0 : params.url) || (defaultUrl == null ? void 0 : defaultUrl[type]);
   let _params = { ...params };
   delete _params.url;

package/lib/components/tabs/index.js

@@ -46,6 +46,11 @@ var Tabs = class extends import_react.Component {
   componentDidMount() {
     document.body.id = "body";
   }
+  componentDidUpdate(prevProps) {
+    if (prevProps.activeKey !== this.props.activeKey) {
+      this.setState({ activeKey: this.props.activeKey });
+    }
+  }
   _handleChange = (key) => {
     this.setActiveKey(key);
   };

package/lib/components/time-picker/index.d.ts

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

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 import './index.less';
 export interface Version {

package/lib/components/virtual-keyboard/BaseNumberKeyboard/Presets.d.ts

@@ -0,0 +1,11 @@
+import "./Presets.less";
+export declare type PresetsItem = {
+    label: string;
+    value: number | string;
+};
+export interface PresetsProps {
+    presets?: PresetsItem[];
+    onChange: (val: string) => void;
+}
+declare const Presets: (props: PresetsProps) => JSX.Element | null;
+export default Presets;

package/lib/components/virtual-keyboard/BaseNumberKeyboard/index.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+import { PresetsProps } from './Presets';
+import { RightItemsStyleProps } from '../Amount';
+import './index.less';
+export interface BaseNumberKeyboardProps {
+    placeholder?: string;
+    format?: (val: string) => React.ReactNode;
+    defaultValue?: string | number;
+    doneText?: string;
+    resetText?: string;
+    onChange?: (val: string) => void;
+    onEnter?: (val: string) => void;
+    value?: string | number;
+    max?: number;
+    min?: number;
+    presets?: PresetsProps['presets'];
+    defaultSelect?: boolean;
+    rightItemsStyle?: RightItemsStyleProps;
+}
+declare const BaseNumberKeyboard: (props: BaseNumberKeyboardProps) => JSX.Element;
+export default BaseNumberKeyboard;

package/lib/components/virtual-keyboard/Number/index.d.ts

@@ -0,0 +1,5 @@
+import { NumberProps } from './types';
+import './index.less';
+export type { NumberProps };
+declare const Number: (props: NumberProps) => JSX.Element;
+export default Number;