@pisell/materials 6.0.5 → 6.0.6

package/es/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -53,8 +53,8 @@ var SubmitButton = function SubmitButton(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.prev = 0;
             setLoading(true);
+            _context.prev = 1;
             if (!(renderMode === 'edit')) {
               _context.next = 7;
               break;
@@ -75,23 +75,14 @@ var SubmitButton = function SubmitButton(props) {
             res = _context.sent;
             form === null || form === void 0 ? void 0 : form.resetFields();
           case 12:
-            _context.next = 17;
-            break;
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](0);
-            PisellToast({
-              content: "\u64CD\u4F5C\u5931\u8D25\uFF1A".concat(_context.t0.message)
-            });
-          case 17:
-            _context.prev = 17;
+            _context.prev = 12;
             setLoading(false);
-            return _context.finish(17);
-          case 20:
+            return _context.finish(12);
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 14, 17, 20]]);
+      }, _callee, null, [[1,, 12, 15]]);
     }));
     return function onSubmit(_x2) {
       return _ref.apply(this, arguments);
@@ -160,12 +151,15 @@ var SubmitButton = function SubmitButton(props) {
                 afterSubmitFunc();
               }
             }
-            _context2.next = 15;
+            _context2.next = 16;
             break;
           case 13:
             _context2.prev = 13;
             _context2.t0 = _context2["catch"](0);
-          case 15:
+            PisellToast({
+              content: "".concat(_context2.t0.message)
+            });
+          case 16:
           case "end":
             return _context2.stop();
         }

package/es/components/dataSourceComponents/dataSourceTable/BaseTable.js

@@ -43,6 +43,11 @@ var BaseTable = function BaseTable(props) {
     handleValuesChange = _useTableQuery.handleValuesChange,
     refreshData = _useTableQuery.refreshData,
     handleFilterChange = _useTableQuery.handleFilterChange;
+  var handleAllValuesChange = function handleAllValuesChange(changedValues, values) {
+    var _props$onValuesChange;
+    props === null || props === void 0 ? void 0 : (_props$onValuesChange = props.onValuesChange) === null || _props$onValuesChange === void 0 ? void 0 : _props$onValuesChange.call(props, changedValues, values);
+    handleValuesChange(changedValues, values);
+  };
 
   // 设计模式下对抽屉的显隐处理
   useDesignMode(props, {
@@ -88,7 +93,7 @@ var BaseTable = function BaseTable(props) {
   }, others, transformProps, {
     dataSource: (data === null || data === void 0 ? void 0 : data.data) || [],
     loading: list === null || list === void 0 ? void 0 : list.loading,
-    onValuesChange: handleValuesChange
+    onValuesChange: handleAllValuesChange
   })), /*#__PURE__*/React.createElement(ActionsProvider, {
     visible: drawerVisible,
     setVisible: setDrawerVisible,

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

@@ -143,8 +143,8 @@ var useFormat = function useFormat(_ref4) {
 
   // list接口请求 参数格式化
   var formatListParams = useMemoizedFn(function (params) {
-    // 如果dataSourceKey为空 则为标准数据源
-    if (!dataSourceKey) {
+    // 如果dataSourceKey为空 pisell2 main  则为标准数据源
+    if (!dataSourceKey || ['pisell2', 'main'].includes(dataSourceKey)) {
       return _objectSpread(_objectSpread({}, params), {}, {
         filter: formatFilter(params.filter, fields),
         sort: formatSort(params.sort)

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

@@ -30,11 +30,17 @@ declare const useTableProps: (props: UseTablePropsProps) => {
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
+    actionButtons: any[] | null;
     titleButtons?: {
         show: boolean;
         maxCount: number;
         items: OperationItem[];
     } | undefined;
+    tableButtons?: {
+        show: boolean;
+        maxCount: number;
+        items: OperationItem[];
+    } | undefined;
     operation?: {
         show: boolean;
         title: string;
@@ -74,5 +80,6 @@ declare const useTableProps: (props: UseTablePropsProps) => {
             sortBy: string;
         }[];
     } | undefined;
+    onValuesChange?: ((changedValues: any, values: any) => void) | undefined;
 };
 export default useTableProps;

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

@@ -38,6 +38,7 @@ var useTableProps = function useTableProps(props) {
   var propsTitle = originProps.title,
     propsSubTitle = originProps.subTitle,
     titleButtons = originProps.titleButtons,
+    tableButtons = originProps.tableButtons,
     operation = originProps.operation,
     propsFilter = originProps.filter,
     search = originProps.search,
@@ -209,6 +210,25 @@ var useTableProps = function useTableProps(props) {
       });
     });
   }, [titleButtons]);
+  var actionButtons = useMemo(function () {
+    var _tableButtons$items;
+    if (!(tableButtons !== null && tableButtons !== void 0 && tableButtons.show)) {
+      return null;
+    }
+    return tableButtons === null || tableButtons === void 0 ? void 0 : (_tableButtons$items = tableButtons.items) === null || _tableButtons$items === void 0 ? void 0 : _tableButtons$items.map(function (button) {
+      var actionType = button.actionType,
+        buttonProps = button.buttonProps;
+      return _objectSpread(_objectSpread(_objectSpread({}, button), buttonProps), {}, {
+        size: "large",
+        title: button.label,
+        onClick: function onClick() {
+          if (actionType === 'add') {
+            handleOpenDrawer(null, button);
+          }
+        }
+      });
+    });
+  }, [tableButtons]);
   var filter = useMemo(function () {
     if (!(propsFilter !== null && propsFilter !== void 0 && propsFilter.show) && !(search !== null && search !== void 0 && search.show)) {
       return null;
@@ -255,7 +275,8 @@ var useTableProps = function useTableProps(props) {
     subTitle: subTitle,
     buttons: buttons,
     filter: filter,
-    onRow: onRow
+    onRow: onRow,
+    actionButtons: actionButtons
   });
 };
 export default useTableProps;

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

@@ -40,7 +40,7 @@ var useTableQuery = function useTableQuery(props) {
       if ("tabs" in params) {
         var _params$tabs, _params$tabs2;
         sort = ((_params$tabs = params.tabs) === null || _params$tabs === void 0 ? void 0 : _params$tabs.sortBy) || sortBy || "";
-        filter = ((_params$tabs2 = params.tabs) === null || _params$tabs2 === void 0 ? void 0 : _params$tabs2.filterBy) || {};
+        filter = _objectSpread(_objectSpread({}, prev.filter), ((_params$tabs2 = params.tabs) === null || _params$tabs2 === void 0 ? void 0 : _params$tabs2.filterBy) || {});
       }
       if ("order_by" in params) {
         var _allParams$tabs;
@@ -58,7 +58,7 @@ var useTableQuery = function useTableQuery(props) {
     setQueryPageConfig(function (prev) {
       return _objectSpread(_objectSpread({}, prev), {}, {
         page: 1,
-        filter: _objectSpread(_objectSpread({}, allFields), filterBy || {})
+        filter: _objectSpread(_objectSpread(_objectSpread({}, prev.filter), allFields), filterBy || {})
       });
     });
   });

package/es/components/dataSourceComponents/dataSourceTable/type.d.ts

@@ -18,6 +18,11 @@ export interface DataSourceTableProps {
         maxCount: number;
         items: OperationItem[];
     };
+    tableButtons?: {
+        show: boolean;
+        maxCount: number;
+        items: OperationItem[];
+    };
     buttons?: any[];
     operation?: {
         show: boolean;
@@ -61,4 +66,5 @@ export interface DataSourceTableProps {
             sortBy: string;
         }[];
     };
+    onValuesChange?: (changedValues: any, values: any) => void;
 }

package/es/components/dataSourceComponents/provider/variables/VariablesProvider.js

@@ -1,4 +1,4 @@
-import React, { useMemo, useRef, useEffect } from 'react';
+import React, { useMemo, useRef } from 'react';
 import { isArr, isString, isUndefined } from '@pisell/utils';
 import { useMemoizedFn } from 'ahooks';
 import VariablesContext from "./VariablesContext";
@@ -18,14 +18,15 @@ var VariablesProvider = function VariablesProvider(props) {
     variables = props.variables;
 
   // 变量存储
-  var variablesRef = useRef({});
+  var variablesRef = useRef(variables || {});
   // 添加变量变化监听器存储
   var listenersRef = useRef(new Set());
-  useEffect(function () {
-    if (variables) {
-      variablesRef.current = variables;
-    }
-  }, [variables]);
+
+  // useEffect(() => {
+  //   if (variables) {
+  //     variablesRef.current = variables;
+  //   }
+  // }, [variables]);
 
   // 注册变量
   var registerVariable = useMemoizedFn(function (value) {

package/es/components/page/index.js

@@ -45,7 +45,7 @@ var localeDateMap = {
   }
 };
 var Page = function Page(props) {
-  var _context$appHelper, _context$engine, _context$engine$props, _localeDateMap;
+  var _context$appHelper, _context$engine, _context$engine$props, _localeDateMap, _context$engine2, _context$engine2$prop;
   var children = props.children,
     style = props.style,
     className = props.className,
@@ -253,7 +253,9 @@ var Page = function Page(props) {
     }
   }, /*#__PURE__*/React.createElement(PisellConfigProvider, {
     locale: locale
-  }, /*#__PURE__*/React.createElement(VariablesProvider, null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(VariablesProvider, {
+    variables: ((_context$engine2 = context.engine) === null || _context$engine2 === void 0 ? void 0 : (_context$engine2$prop = _context$engine2.props) === null || _context$engine2$prop === void 0 ? void 0 : _context$engine2$prop.variables) || {}
+  }, /*#__PURE__*/React.createElement("div", {
     style: _objectSpread(_objectSpread({}, style), {}, {
       '--theme-color': themeColor || '#7F56D9'
     }),

package/es/components/select/index.js

@@ -73,10 +73,11 @@ var SelectBase = /*#__PURE__*/forwardRef(function (props, ref) {
     return mode === 'multiple' && isShowDropdown && selectAll;
   }, [mode, selectAll, isShowDropdown]);
   var checkboxChecked = useMemo(function () {
+    var _state$sort, _filteredOptions$map, _filteredOptions$map$;
     if (mode !== 'multiple') return false;
-    return (state === null || state === void 0 ? void 0 : state.length) === (filteredOptions === null || filteredOptions === void 0 ? void 0 : filteredOptions.length) && state.sort().join('') === filteredOptions.map(function (item) {
+    return (state === null || state === void 0 ? void 0 : state.length) === (filteredOptions === null || filteredOptions === void 0 ? void 0 : filteredOptions.length) && (state === null || state === void 0 ? void 0 : (_state$sort = state.sort()) === null || _state$sort === void 0 ? void 0 : _state$sort.join('')) === (filteredOptions === null || filteredOptions === void 0 ? void 0 : (_filteredOptions$map = filteredOptions.map(function (item) {
       return item.value;
-    }).sort().join('');
+    })) === null || _filteredOptions$map === void 0 ? void 0 : (_filteredOptions$map$ = _filteredOptions$map.sort()) === null || _filteredOptions$map$ === void 0 ? void 0 : _filteredOptions$map$.join(''));
   }, [state, filteredOptions]);
   var dropdownRender = useCallback(propsDropdownRender ? propsDropdownRender : function (originNode) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, showSearch && /*#__PURE__*/React.createElement(Input, {

package/lib/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -62,18 +62,14 @@ var SubmitButton = (props) => {
   const { create, update } = (0, import_useDataSource.default)();
   const isDisabled = status === "disabled";
   const onSubmit = async (values) => {
+    setLoading(true);
     try {
-      setLoading(true);
       if (renderMode === "edit") {
         await update.runAsync(values);
       } else if (renderMode === "add") {
         const res = await create.runAsync(values);
         form == null ? void 0 : form.resetFields();
       }
-    } catch (error) {
-      (0, import_pisellToast.default)({
-        content: `操作失败：${error.message}`
-      });
     } finally {
       setLoading(false);
     }
@@ -130,6 +126,9 @@ var SubmitButton = (props) => {
         }
       }
     } catch (error) {
+      (0, import_pisellToast.default)({
+        content: `${error.message}`
+      });
     }
   };
   const onSubmitClick = async () => {

package/lib/components/dataSourceComponents/dataSourceTable/BaseTable.js

@@ -68,6 +68,11 @@ var BaseTable = (props) => {
     drawerContent
   } = (0, import_useDrawerState.default)(operationContent);
   const { queryPageConfig, handleValuesChange, refreshData, handleFilterChange } = (0, import_useTableQuery.default)(props);
+  const handleAllValuesChange = (changedValues, values) => {
+    var _a;
+    (_a = props == null ? void 0 : props.onValuesChange) == null ? void 0 : _a.call(props, changedValues, values);
+    handleValuesChange(changedValues, values);
+  };
   (0, import_useDesignMode.default)(props, {
     registerValueVariable,
     openDrawer,
@@ -112,7 +117,7 @@ var BaseTable = (props) => {
       ...transformProps,
       dataSource: (data == null ? void 0 : data.data) || [],
       loading: list == null ? void 0 : list.loading,
-      onValuesChange: handleValuesChange
+      onValuesChange: handleAllValuesChange
     }
   ), /* @__PURE__ */ import_react.default.createElement(
     import_ActionsProvider.default,

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

@@ -142,7 +142,7 @@ var useFormat = ({ dataSourceKey, fields }) => {
     }
   );
   const formatListParams = (0, import_ahooks.useMemoizedFn)((params) => {
-    if (!dataSourceKey) {
+    if (!dataSourceKey || ["pisell2", "main"].includes(dataSourceKey)) {
       return {
         ...params,
         filter: formatFilter(params.filter, fields),

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

@@ -30,11 +30,17 @@ declare const useTableProps: (props: UseTablePropsProps) => {
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
+    actionButtons: any[] | null;
     titleButtons?: {
         show: boolean;
         maxCount: number;
         items: OperationItem[];
     } | undefined;
+    tableButtons?: {
+        show: boolean;
+        maxCount: number;
+        items: OperationItem[];
+    } | undefined;
     operation?: {
         show: boolean;
         title: string;
@@ -74,5 +80,6 @@ declare const useTableProps: (props: UseTablePropsProps) => {
             sortBy: string;
         }[];
     } | undefined;
+    onValuesChange?: ((changedValues: any, values: any) => void) | undefined;
 };
 export default useTableProps;

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

@@ -59,6 +59,7 @@ var useTableProps = (props) => {
     title: propsTitle,
     subTitle: propsSubTitle,
     titleButtons,
+    tableButtons,
     operation,
     filter: propsFilter,
     search,
@@ -198,6 +199,26 @@ var useTableProps = (props) => {
       };
     });
   }, [titleButtons]);
+  const actionButtons = (0, import_react.useMemo)(() => {
+    var _a2;
+    if (!(tableButtons == null ? void 0 : tableButtons.show)) {
+      return null;
+    }
+    return (_a2 = tableButtons == null ? void 0 : tableButtons.items) == null ? void 0 : _a2.map((button) => {
+      const { actionType, buttonProps } = button;
+      return {
+        ...button,
+        ...buttonProps,
+        size: "large",
+        title: button.label,
+        onClick: () => {
+          if (actionType === "add") {
+            handleOpenDrawer(null, button);
+          }
+        }
+      };
+    });
+  }, [tableButtons]);
   const filter = (0, import_react.useMemo)(() => {
     if (!(propsFilter == null ? void 0 : propsFilter.show) && !(search == null ? void 0 : search.show)) {
       return null;
@@ -248,7 +269,8 @@ var useTableProps = (props) => {
     subTitle,
     buttons,
     filter,
-    onRow
+    onRow,
+    actionButtons
   };
 };
 var useTableProps_default = useTableProps;

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

@@ -42,7 +42,7 @@ var useTableQuery = (props) => {
         let filter = prev.filter;
         if ("tabs" in params) {
           sort = ((_a2 = params.tabs) == null ? void 0 : _a2.sortBy) || sortBy || "";
-          filter = ((_b2 = params.tabs) == null ? void 0 : _b2.filterBy) || {};
+          filter = { ...prev.filter, ...((_b2 = params.tabs) == null ? void 0 : _b2.filterBy) || {} };
         }
         if ("order_by" in params) {
           sort = params.order_by || ((_c2 = allParams.tabs) == null ? void 0 : _c2.sortBy) || sortBy;
@@ -62,7 +62,7 @@ var useTableQuery = (props) => {
       setQueryPageConfig((prev) => ({
         ...prev,
         page: 1,
-        filter: { ...allFields, ...filterBy || {} }
+        filter: { ...prev.filter, ...allFields, ...filterBy || {} }
       }));
     }
   );

package/lib/components/dataSourceComponents/dataSourceTable/type.d.ts

@@ -18,6 +18,11 @@ export interface DataSourceTableProps {
         maxCount: number;
         items: OperationItem[];
     };
+    tableButtons?: {
+        show: boolean;
+        maxCount: number;
+        items: OperationItem[];
+    };
     buttons?: any[];
     operation?: {
         show: boolean;
@@ -61,4 +66,5 @@ export interface DataSourceTableProps {
             sortBy: string;
         }[];
     };
+    onValuesChange?: (changedValues: any, values: any) => void;
 }

package/lib/components/dataSourceComponents/provider/variables/VariablesProvider.js

@@ -47,13 +47,8 @@ var defaultCustomizer = (objValue, srcValue) => {
 var VARIABLE_PATTERN = /{{([^}]+)}}/g;
 var VariablesProvider = (props) => {
   const { children, variables } = props;
-  const variablesRef = (0, import_react.useRef)({});
+  const variablesRef = (0, import_react.useRef)(variables || {});
   const listenersRef = (0, import_react.useRef)(/* @__PURE__ */ new Set());
-  (0, import_react.useEffect)(() => {
-    if (variables) {
-      variablesRef.current = variables;
-    }
-  }, [variables]);
   const registerVariable = (0, import_ahooks.useMemoizedFn)((value2) => {
     variablesRef.current = (0, import_utils3.mergeWith)(
       variablesRef.current,

package/lib/components/page/index.js

@@ -69,7 +69,7 @@ var localeDateMap = {
   }
 };
 var Page = (props) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const { children, style, className, locale: propsLocale, ...others } = props;
   const context = (0, import_useEngineContext.default)();
   const { platform, themeColor } = ((_a = context.appHelper) == null ? void 0 : _a.constants) || {};
@@ -271,7 +271,7 @@ var Page = (props) => {
           dateAdapter: import_AdapterDayjs.AdapterDayjs,
           adapterLocale: ((_d = localeDateMap == null ? void 0 : localeDateMap[locale]) == null ? void 0 : _d.adapterLocale) || "en"
         },
-        /* @__PURE__ */ import_react.default.createElement(import_date_picker.ThemeProvider, { theme: datePickerTheme }, /* @__PURE__ */ import_react.default.createElement(import_date_picker.LocaleProvider, { value: { locale } }, /* @__PURE__ */ import_react.default.createElement(import_pisell_config_provider.default, { locale }, /* @__PURE__ */ import_react.default.createElement(import_VariablesProvider.default, null, /* @__PURE__ */ import_react.default.createElement(
+        /* @__PURE__ */ import_react.default.createElement(import_date_picker.ThemeProvider, { theme: datePickerTheme }, /* @__PURE__ */ import_react.default.createElement(import_date_picker.LocaleProvider, { value: { locale } }, /* @__PURE__ */ import_react.default.createElement(import_pisell_config_provider.default, { locale }, /* @__PURE__ */ import_react.default.createElement(import_VariablesProvider.default, { variables: ((_f = (_e = context.engine) == null ? void 0 : _e.props) == null ? void 0 : _f.variables) || {} }, /* @__PURE__ */ import_react.default.createElement(
           "div",
           {
             style: {

package/lib/components/select/index.js

@@ -98,9 +98,10 @@ var SelectBase = (0, import_react.forwardRef)((props, ref) => {
     return mode === "multiple" && isShowDropdown && selectAll;
   }, [mode, selectAll, isShowDropdown]);
   const checkboxChecked = (0, import_react.useMemo)(() => {
+    var _a, _b, _c;
     if (mode !== "multiple")
       return false;
-    return (state == null ? void 0 : state.length) === (filteredOptions == null ? void 0 : filteredOptions.length) && state.sort().join("") === filteredOptions.map((item) => item.value).sort().join("");
+    return (state == null ? void 0 : state.length) === (filteredOptions == null ? void 0 : filteredOptions.length) && ((_a = state == null ? void 0 : state.sort()) == null ? void 0 : _a.join("")) === ((_c = (_b = filteredOptions == null ? void 0 : filteredOptions.map((item) => item.value)) == null ? void 0 : _b.sort()) == null ? void 0 : _c.join(""));
   }, [state, filteredOptions]);
   const dropdownRender = (0, import_react.useCallback)(
     propsDropdownRender ? propsDropdownRender : (originNode) => {