@pisell/materials 6.0.15 → 6.0.16

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -52,7 +52,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.js

@@ -214,8 +214,11 @@ var useTableProps = function useTableProps(props) {
             onClick: handleClick,
             type: type === 'link' ? 'link' : 'default',
             style: type === 'link' ? {
-              padding: '0'
-            } : {}
+              padding: '0',
+              height: 'auto'
+            } : {
+              height: 'auto'
+            }
           }, label);
         }));
       }
@@ -238,7 +241,7 @@ var useTableProps = function useTableProps(props) {
         beforeOpen = button.beforeOpen;
       return _objectSpread(_objectSpread(_objectSpread({}, button), buttonProps), {}, {
         title: button.label,
-        size: "large",
+        size: 'large',
         onClick: function onClick() {
           if (actionType === 'add') {
             var result = true;

package/es/components/dataSourceComponents/fields/Upload/index.js

@@ -17,7 +17,7 @@ var Upload = withFormItem(UploadWithMode, {
           var _checkFileCount = checkFileCount({
               minCount: props.minCount || 0,
               maxCount: props.maxCount || DEFAULT_MAX_COUNT,
-              valueLength: value.length,
+              valueLength: (value === null || value === void 0 ? void 0 : value.length) || 0,
               multiple: !!props.multiple
             }),
             success = _checkFileCount.success,

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;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "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/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -52,7 +52,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.js

@@ -113,33 +113,35 @@ var useTableProps = (props) => {
     });
     openDrawer(item);
   });
-  const handleDelete = (0, import_ahooks.useMemoizedFn)(async (record, softDelete) => {
-    try {
-      registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
-        currentRecord: { ...record }
-      });
-      setTimeout(async () => {
-        if (softDelete) {
-          const deleteTime = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
-          await (update == null ? void 0 : update.runAsync({
-            ...record,
-            deleted_at: deleteTime
-          }));
-        } else {
-          await (destroy == null ? void 0 : destroy.runAsync(record.id));
-        }
-        refreshData();
+  const handleDelete = (0, import_ahooks.useMemoizedFn)(
+    async (record, softDelete) => {
+      try {
+        registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
+          currentRecord: { ...record }
+        });
+        setTimeout(async () => {
+          if (softDelete) {
+            const deleteTime = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+            await (update == null ? void 0 : update.runAsync({
+              ...record,
+              deleted_at: deleteTime
+            }));
+          } else {
+            await (destroy == null ? void 0 : destroy.runAsync(record.id));
+          }
+          refreshData();
+          (0, import_pisellToast.default)({
+            content: (0, import_locales.getText)("pisell-action-delete-success")
+          });
+        });
+      } catch (error) {
+        console.error(error);
         (0, import_pisellToast.default)({
-          content: (0, import_locales.getText)("pisell-action-delete-success")
+          content: (0, import_locales.getText)("pisell-action-delete-failed")
         });
-      });
-    } catch (error) {
-      console.error(error);
-      (0, import_pisellToast.default)({
-        content: (0, import_locales.getText)("pisell-action-delete-failed")
-      });
+      }
     }
-  });
+  );
   const actionsColumns = (0, import_react.useMemo)(() => {
     if (!show) {
       return [];
@@ -189,8 +191,11 @@ var useTableProps = (props) => {
                 onClick: handleClick,
                 type: type === "link" ? "link" : "default",
                 style: type === "link" ? {
-                  padding: "0"
-                } : {}
+                  padding: "0",
+                  height: "auto"
+                } : {
+                  height: "auto"
+                }
               },
               label
             );

package/lib/components/dataSourceComponents/fields/Upload/index.js

@@ -45,7 +45,7 @@ var Upload = (0, import_utils.withFormItem)(import_WithMode.default, {
           const { success, message } = (0, import_utils2.checkFileCount)({
             minCount: props.minCount || 0,
             maxCount: props.maxCount || import_constants.DEFAULT_MAX_COUNT,
-            valueLength: value.length,
+            valueLength: (value == null ? void 0 : value.length) || 0,
             multiple: !!props.multiple
           });
           if (!success) {

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;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "6.0.15",
+  "version": "6.0.16",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -67,9 +67,9 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "react-window": "^1.8.10",
     "styled-components": "^6.0.0-rc.3",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "1.0.100",
-    "@pisell/utils": "1.0.42",
-    "@pisell/icon": "0.0.11"
+    "@pisell/utils": "1.0.42"
   },
   "peerDependencies": {
     "react": "^18.0.0",