@pisell/materials 1.0.458 → 1.0.460

package/es/components/dataSourceComponents/dataSourceForm/BaseForm.js

@@ -7,7 +7,6 @@ import classNames from 'classnames';
 import useDataSource from "../hooks/useDataSource";
 import Form from "../../form";
 import FormSettingProvider from "./provider/formSetting/FormSettingProvider";
-import useSetRequest from "../../../hooks/useSetRequest";
 import "./index.less";
 
 /**
@@ -27,7 +26,6 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     currentValue = props.currentValue,
     className = props.className,
     others = _objectWithoutProperties(props, _excluded);
-  useSetRequest();
   var formRef = useRef(null);
   var _useDataSource = useDataSource(),
     get = _useDataSource.get;

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

@@ -14,8 +14,8 @@ import PisellToast from "../../../pisellToast";
 import PisellModal from "../../../pisellModal";
 import FormItem from "../formItem";
 import useFormSetting from "../provider/hooks/useFormSetting";
-import useActions from "../../hooks/useActions";
 import useCtxActions from "../../hooks/useCtxActions";
+import useDataSource from "../../hooks/useDataSource";
 import "./index.less";
 // 表单提交按钮
 var SubmitButton = function SubmitButton(props) {
@@ -42,9 +42,9 @@ var SubmitButton = function SubmitButton(props) {
   var _useCtxActions = useCtxActions(),
     setVisible = _useCtxActions.setVisible,
     refreshTableData = _useCtxActions.refreshTableData;
-  var _useActions = useActions(),
-    create = _useActions.create,
-    update = _useActions.update;
+  var _useDataSource = useDataSource(),
+    create = _useDataSource.create,
+    update = _useDataSource.update;
   var isDisabled = status === 'disabled';
   var onSubmit = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
@@ -59,7 +59,7 @@ var SubmitButton = function SubmitButton(props) {
               break;
             }
             _context.next = 5;
-            return update(values);
+            return update.runAsync(values);
           case 5:
             _context.next = 12;
             break;
@@ -69,7 +69,7 @@ var SubmitButton = function SubmitButton(props) {
               break;
             }
             _context.next = 10;
-            return create(values);
+            return create.runAsync(values);
           case 10:
             res = _context.sent;
             form === null || form === void 0 ? void 0 : form.resetFields();

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

@@ -7,7 +7,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 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 React, { useEffect, useMemo } from 'react';
-import { Drawer, Button, Space } from 'antd';
+import { Drawer, Button, Space, message } from 'antd';
 import Table from "../../table";
 import useVariables from "../hooks/useVariables";
 import useColumns from "./hooks/useColumns";
@@ -16,10 +16,10 @@ import ActionsProvider from "../provider/actions/ActionsProvider";
 import useDrawerState from "./hooks/useDrawerState";
 import useDesignMode from "./hooks/useDesignMode";
 import useTableQuery from "./hooks/useTableQuery";
-import useSetRequest from "../../../hooks/useSetRequest";
 import { getText } from "../../../locales";
 import useDataSource from "../hooks/useDataSource";
 import TableSettingProvider from "./provider/tableSetting/TableSettingProvider";
+import useDataSourceKey from "./hooks/useDataSourceKey";
 var DRAWER_TITLES = {
   detail: getText('pisell-data-source-table-detail'),
   edit: getText('pisell-data-source-table-edit'),
@@ -37,13 +37,15 @@ var BaseTable = function BaseTable(props) {
     addContent = props.addContent,
     __designMode = props.__designMode,
     others = _objectWithoutProperties(props, _excluded);
-  useSetRequest();
   var _useVariables = useVariables(),
     registerVariable = _useVariables.registerVariable;
   var _useDataSource = useDataSource(),
     list = _useDataSource.list,
     destroy = _useDataSource.destroy;
   var data = list.data;
+  var _useDataSourceKey = useDataSourceKey(),
+    dataSourceKey = _useDataSourceKey.dataSourceKey,
+    dataSourceKeyRef = _useDataSourceKey.dataSourceKeyRef;
   var _useDrawerState = useDrawerState(),
     drawerVisible = _useDrawerState.drawerVisible,
     setDrawerVisible = _useDrawerState.setDrawerVisible,
@@ -63,12 +65,15 @@ var BaseTable = function BaseTable(props) {
     data: data === null || data === void 0 ? void 0 : data.data
   });
   useEffect(function () {
-    if (dataSource) {
+    refreshData();
+  }, [dataSourceKey]);
+  useEffect(function () {
+    if (dataSourceKeyRef.current) {
       list === null || list === void 0 ? void 0 : list.run(queryPageConfig);
     } else {
       list === null || list === void 0 ? void 0 : list.mutate([]);
     }
-  }, [dataSource, list === null || list === void 0 ? void 0 : list.run, queryPageConfig]);
+  }, [queryPageConfig]);
 
   // 打开抽屉
   var handleOpenDrawer = function handleOpenDrawer(record, type) {
@@ -92,24 +97,29 @@ var BaseTable = function BaseTable(props) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            registerVariable === null || registerVariable === void 0 ? void 0 : registerVariable({
-              currentRecord: record
-            });
-            setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.next = 2;
-                    return destroy === null || destroy === void 0 ? void 0 : destroy.run(record.id);
-                  case 2:
-                    refreshData();
-                  case 3:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            })));
-          case 2:
+            try {
+              registerVariable === null || registerVariable === void 0 ? void 0 : registerVariable({
+                currentRecord: record
+              });
+              setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      _context.next = 2;
+                      return destroy === null || destroy === void 0 ? void 0 : destroy.run(record.id);
+                    case 2:
+                      refreshData();
+                    case 3:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee);
+              })));
+            } catch (error) {
+              console.error(error);
+              message.error('删除失败,请重试');
+            }
+          case 1:
           case "end":
             return _context2.stop();
         }
@@ -156,18 +166,16 @@ var BaseTable = function BaseTable(props) {
     actionsColumns: actionsColumns
   });
   var pagination = usePagination({
-    data: data === null || data === void 0 ? void 0 : data.data
+    data: data
   });
-
-  // 获取抽屉内容
-  var getDrawerContent = function getDrawerContent(type) {
+  var drawerContent = useMemo(function () {
     var contentMap = {
       detail: detailContent,
       edit: editContent,
       add: addContent
     };
-    return contentMap[type];
-  };
+    return contentMap[drawerType];
+  }, [drawerType, detailContent, editContent, addContent]);
   return /*#__PURE__*/React.createElement(TableSettingProvider, null, showAddButton && /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: 16
@@ -192,6 +200,6 @@ var BaseTable = function BaseTable(props) {
     open: drawerVisible,
     onClose: handleCloseDrawer,
     destroyOnClose: true
-  }, getDrawerContent(drawerType))));
+  }, drawerContent)));
 };
 export default BaseTable;

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

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+declare const useDataSourceKey: () => {
+    dataSourceKey: string;
+    dataSourceKeyRef: import("react").MutableRefObject<string>;
+};
+export default useDataSourceKey;

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

@@ -0,0 +1,17 @@
+import { useMemo, useRef } from 'react';
+import { isString } from '@pisell/utils';
+import useDataSource from "../../hooks/useDataSource";
+var useDataSourceKey = function useDataSourceKey() {
+  var _useDataSource = useDataSource(),
+    dataSource = _useDataSource.dataSource;
+  var dataSourceKey = useMemo(function () {
+    return isString(dataSource) ? dataSource : dataSource === null || dataSource === void 0 ? void 0 : dataSource.key;
+  }, [dataSource]);
+  var dataSourceKeyRef = useRef(dataSourceKey);
+  dataSourceKeyRef.current = dataSourceKey;
+  return {
+    dataSourceKey: dataSourceKey,
+    dataSourceKeyRef: dataSourceKeyRef
+  };
+};
+export default useDataSourceKey;

package/es/components/dataSourceComponents/hooks/useActions.js

@@ -189,7 +189,7 @@ var useActions = function useActions() {
               break;
             }
             message.error('请先获取数据');
-            return _context4.abrupt("return", {});
+            return _context4.abrupt("return", Promise.reject());
           case 12:
             return _context4.abrupt("return", updateNocobaseData({
               key: name,

package/es/components/dataSourceComponents/provider/fields/DataSourceProvider.js

@@ -5,6 +5,8 @@ import DataSourceContext from "./DataSourceContext";
 import useActions from "../../hooks/useActions";
 import useVariables from "../../hooks/useVariables";
 import useDataSource from "../../hooks/useDataSource";
+import useSetRequest from "../../../../hooks/useSetRequest";
+
 /**
  * @title: DataSource Provider
  * @description: 提供页面配置的数据源
@@ -13,6 +15,7 @@ var DataSourceProvider = function DataSourceProvider(props) {
   var children = props.children,
     propsDataSource = props.dataSource,
     currentValue = props.currentValue;
+  useSetRequest();
   var _useVariables = useVariables(),
     parseVariable = _useVariables.parseVariable;
   var _useDataSource = useDataSource(),
@@ -22,7 +25,6 @@ var DataSourceProvider = function DataSourceProvider(props) {
       currentDataSource: ctxDataSource
     }
   }) : propsDataSource;
-  console.log(dataSource, 'dataSource');
   var _useActions = useActions({
       dataSource: dataSource,
       currentValue: currentValue

package/es/components/productCard/components/AmountFooter/index.js

@@ -29,7 +29,7 @@ var Footer = function Footer(_ref) {
     className: classNames("".concat(prefix, "packages-product-footer"), hideDivider && "".concat(prefix, "packages-product-hide-divider-footer"))
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, _formatAmount(item === null || item === void 0 ? void 0 : item.total, item === null || item === void 0 ? void 0 : item.symbol)), /*#__PURE__*/React.createElement("span", null, "\xD7".concat(item === null || item === void 0 ? void 0 : item.num)), /*#__PURE__*/React.createElement("span", {
     className: "".concat(prefix, "packages-product-footer-total")
-  }, "".concat(item === null || item === void 0 ? void 0 : item.symbol, " ").concat(_formatAmount((item === null || item === void 0 ? void 0 : item.total) * (item === null || item === void 0 ? void 0 : item.num))))), isDiscount ? /*#__PURE__*/React.createElement("div", {
+  }, _formatAmount((item === null || item === void 0 ? void 0 : item.total) * (item === null || item === void 0 ? void 0 : item.num), item === null || item === void 0 ? void 0 : item.symbol))), isDiscount ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "packages-product-footer-discount")
   }, /*#__PURE__*/React.createElement("span", null, _formatAmount(item === null || item === void 0 ? void 0 : item.origin_total, item === null || item === void 0 ? void 0 : item.symbol)), /*#__PURE__*/React.createElement("span", null, _formatAmount((item === null || item === void 0 ? void 0 : item.origin_total) * (item === null || item === void 0 ? void 0 : item.num), item === null || item === void 0 ? void 0 : item.symbol, 2))) : null), isDiscount && (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.discount_reason && type === 'total' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "product-item-discount-reason")

package/es/components/productCard/components/Header/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const Header: ({ isShowDelete, item, showImage, onDelete }: any) => React.JSX.Element;
+declare const Header: (props: any) => React.JSX.Element;
 export default Header;

package/es/components/productCard/components/Header/index.js

@@ -6,11 +6,13 @@ import { image, formatAmount } from '@pisell/utils';
 import Options from "../Packages/components/options";
 import "./index.less";
 var prefix = 'pisell-lowcode-';
-var Header = function Header(_ref) {
-  var isShowDelete = _ref.isShowDelete,
-    item = _ref.item,
-    showImage = _ref.showImage,
-    onDelete = _ref.onDelete;
+var Header = function Header(props) {
+  var isShowDelete = props.isShowDelete,
+    item = props.item,
+    showImage = props.showImage,
+    onDelete = props.onDelete,
+    disabledEdit = props.disabledEdit;
+
   /**
    * @title: 是否显示价格
    * @description:
@@ -38,7 +40,7 @@ var Header = function Header(_ref) {
   }, [item === null || item === void 0 ? void 0 : item.options, item === null || item === void 0 ? void 0 : item.product_option_string]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(prefix, "product-header"), headerCenterStyle && "".concat(prefix, "product-options-header"))
-  }, isShowDelete ? /*#__PURE__*/React.createElement("div", {
+  }, isShowDelete && !disabledEdit ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "product-delete"),
     onClick: function onClick(e) {
       e.stopPropagation();

package/es/components/productCard/components/Note/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const Note: ({ item, type, openNote }: any) => React.JSX.Element;
+declare const Note: (props: any) => React.JSX.Element | null;
 export default Note;

package/es/components/productCard/components/Note/index.js

@@ -4,21 +4,22 @@ import { locales } from '@pisell/utils';
 import Divider from "../Divider";
 import "./index.less";
 var prefix = 'pisell-lowcode-';
-var Note = function Note(_ref) {
-  var item = _ref.item,
-    type = _ref.type,
-    openNote = _ref.openNote;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
+var Note = function Note(props) {
+  var item = props.item,
+    type = props.type,
+    openNote = props.openNote,
+    disabledEdit = props.disabledEdit;
+  return item !== null && item !== void 0 && item.note || !disabledEdit ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
     type: type
   }), /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(prefix, "product-note-wrap"))
-  }, item !== null && item !== void 0 && item.note ? /*#__PURE__*/React.createElement("div", null, locales.getText('pisell2.product.card.discount.note'), ": ", item.note) : null, /*#__PURE__*/React.createElement("span", {
+  }, item !== null && item !== void 0 && item.note ? /*#__PURE__*/React.createElement("div", null, locales.getText('pisell2.product.card.discount.note'), ": ", item.note) : null, !disabledEdit ? /*#__PURE__*/React.createElement("span", {
     className: "".concat(prefix, "product-note-btn"),
     onClick: function onClick(e) {
       e.preventDefault();
       e.stopPropagation();
       openNote();
     }
-  }, item !== null && item !== void 0 && item.note ? locales.getText('pisell2.product.card.discount.edit.note') : locales.getText('pisell2.product.card.discount.add.note'))));
+  }, item !== null && item !== void 0 && item.note ? locales.getText('pisell2.product.card.discount.edit.note') : locales.getText('pisell2.product.card.discount.add.note')) : null)) : null;
 };
 export default Note;

package/es/components/productCard/components/Packages/index.js

@@ -6,6 +6,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React from 'react';
 import Divider from "../Divider";
+import { locales } from '@pisell/utils';
 import CollapsibleList from "./components/collapsibleList";
 import { renderBundles } from "./components/collapsibleList/utils";
 import "./index.less";
@@ -18,7 +19,7 @@ var Packages = function Packages(_ref) {
     className: "".concat(prefix, "product-packages-wrap")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "product-packages-title")
-  }, "Items in package"), /*#__PURE__*/React.createElement(CollapsibleList, {
+  }, locales.getText('pisell2.product.card.items.package')), /*#__PURE__*/React.createElement(CollapsibleList, {
     list: bundle || [],
     renderItem: function renderItem(items) {
       return renderBundles(_objectSpread(_objectSpread({}, items), {}, {

package/es/components/productCard/hooks/useOpenNote.js

@@ -13,14 +13,19 @@ var useOpenNote = function useOpenNote(_ref, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
-  var _useState3 = useState(),
+  var _useState3 = useState({}),
     _useState4 = _slicedToArray(_useState3, 2),
-    value = _useState4[0],
-    setValue = _useState4[1];
+    item = _useState4[0],
+    setItem = _useState4[1];
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    value = _useState6[0],
+    setValue = _useState6[1];
   useImperativeHandle(ref, function () {
     return {
       open: function open(_ref2) {
         var item = _ref2.item;
+        setItem(item);
         setValue(item === null || item === void 0 ? void 0 : item.note);
         setOpen(true);
       }
@@ -35,7 +40,7 @@ var useOpenNote = function useOpenNote(_ref, ref) {
     bodyStyle: {
       padding: 0
     },
-    title: value ? locales.getText('pisell2.product.card.discount.edit.note') : locales.getText('pisell2.product.card.discount.add.note'),
+    title: item !== null && item !== void 0 && item.note ? locales.getText('pisell2.product.card.discount.edit.note') : locales.getText('pisell2.product.card.discount.add.note'),
     onCancel: function onCancel() {
       return setOpen(false);
     },
@@ -46,6 +51,7 @@ var useOpenNote = function useOpenNote(_ref, ref) {
     cancelText: locales.getText('pisell2.product.card.cancel')
   }, /*#__PURE__*/React.createElement(Input.TextArea, {
     size: "large",
+    placeholder: locales.getText('pisell2.product.card.note.pla'),
     autoSize: {
       minRows: 4
     },

package/es/components/productCard/index.js

@@ -1,9 +1,13 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _excluded = ["dataSource", "isShowImage", "isShowHolder", "isShowNote", "isShowDelete", "isShowPackageNote", "onAction", "onDelete", "onNote", "onLike", "onCard"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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 React, { useMemo, useRef } from 'react';
 import classNames from 'classnames';
 import { Alert } from 'antd';
@@ -37,7 +41,8 @@ var ProductCard = function ProductCard(props) {
     _onDelete = props.onDelete,
     onNote = props.onNote,
     _onLike = props.onLike,
-    onCard = props.onCard;
+    onCard = props.onCard,
+    other = _objectWithoutProperties(props, _excluded);
   var useOpenNoteRef = useRef();
 
   /**
@@ -73,7 +78,7 @@ var ProductCard = function ProductCard(props) {
       e.stopPropagation();
       onCard === null || onCard === void 0 ? void 0 : onCard(dataSource);
     }
-  }, /*#__PURE__*/React.createElement(Header, {
+  }, /*#__PURE__*/React.createElement(Header, _extends({}, other, {
     item: dataSource,
     isShowImage: isShowImage,
     isShowDelete: isShowDelete,
@@ -81,7 +86,7 @@ var ProductCard = function ProductCard(props) {
     onDelete: function onDelete() {
       _onDelete === null || _onDelete === void 0 ? void 0 : _onDelete(dataSource);
     }
-  }), dataSource !== null && dataSource !== void 0 && dataSource._extend ? /*#__PURE__*/React.createElement(Time, {
+  })), dataSource !== null && dataSource !== void 0 && dataSource._extend ? /*#__PURE__*/React.createElement(Time, {
     item: dataSource,
     isShowHolder: isShowHolder,
     onLike: function onLike(item) {
@@ -97,14 +102,14 @@ var ProductCard = function ProductCard(props) {
     item: dataSource,
     hideDivider: hideDivider,
     type: "total"
-  }), isShowNote ? /*#__PURE__*/React.createElement(Note, {
+  }), isShowNote ? /*#__PURE__*/React.createElement(Note, _extends({}, other, {
     item: dataSource,
     openNote: function openNote() {
       useOpenNoteRef.current.open({
         item: dataSource
       });
     }
-  }) : null, dataSource !== null && dataSource !== void 0 && dataSource._showAction && dataSource !== null && dataSource !== void 0 && dataSource._actionText ? /*#__PURE__*/React.createElement(Action, {
+  })) : null, dataSource !== null && dataSource !== void 0 && dataSource._showAction && dataSource !== null && dataSource !== void 0 && dataSource._actionText ? /*#__PURE__*/React.createElement(Action, {
     item: dataSource,
     onAction: function onAction() {
       return _onAction === null || _onAction === void 0 ? void 0 : _onAction(dataSource);

package/es/components/productCard/locales.d.ts

@@ -6,7 +6,9 @@ declare const _default: {
         'pisell2.product.card.discount.add.note': string;
         'pisell2.product.card.discount.edit.note': string;
         'pisell2.product.card.confirm': string;
-        'pisell2.product.card.discount.cancel': string;
+        'pisell2.product.card.cancel': string;
+        'pisell2.product.card.note.pla': string;
+        'pisell2.product.card.items.package': string;
     };
     'zh-CN': {
         'pisell2.product.card.day': (val: number) => string;
@@ -15,7 +17,9 @@ declare const _default: {
         'pisell2.product.card.discount.add.note': string;
         'pisell2.product.card.discount.edit.note': string;
         'pisell2.product.card.confirm': string;
-        'pisell2.product.card.discount.cancel': string;
+        'pisell2.product.card.cancel': string;
+        'pisell2.product.card.note.pla': string;
+        'pisell2.product.card.items.package': string;
     };
     'zh-HK': {
         'pisell2.product.card.day': (val: number) => string;
@@ -24,7 +28,9 @@ declare const _default: {
         'pisell2.product.card.discount.add.note': string;
         'pisell2.product.card.discount.edit.note': string;
         'pisell2.product.card.confirm': string;
-        'pisell2.product.card.discount.cancel': string;
+        'pisell2.product.card.cancel': string;
+        'pisell2.product.card.note.pla': string;
+        'pisell2.product.card.items.package': string;
     };
 };
 export default _default;

package/es/components/productCard/locales.js

@@ -8,7 +8,9 @@ export default {
     'pisell2.product.card.discount.add.note': 'Add note',
     'pisell2.product.card.discount.edit.note': 'Edit note',
     'pisell2.product.card.confirm': 'Confirm',
-    'pisell2.product.card.discount.cancel': 'Cancel'
+    'pisell2.product.card.cancel': 'Cancel',
+    'pisell2.product.card.note.pla': 'Please enter the note',
+    'pisell2.product.card.items.package': 'Items in package'
   },
   'zh-CN': {
     'pisell2.product.card.day': function pisell2ProductCardDay(val) {
@@ -19,7 +21,9 @@ export default {
     'pisell2.product.card.discount.add.note': '添加备注',
     'pisell2.product.card.discount.edit.note': '编辑备注',
     'pisell2.product.card.confirm': '确定',
-    'pisell2.product.card.discount.cancel': '取消'
+    'pisell2.product.card.cancel': '取消',
+    'pisell2.product.card.note.pla': '请输入备注',
+    'pisell2.product.card.items.package': '包含的商品'
   },
   'zh-HK': {
     'pisell2.product.card.day': function pisell2ProductCardDay(val) {
@@ -30,6 +34,8 @@ export default {
     'pisell2.product.card.discount.add.note': '添加備註',
     'pisell2.product.card.discount.edit.note': '編輯備註',
     'pisell2.product.card.confirm': '確定',
-    'pisell2.product.card.discount.cancel': '取消'
+    'pisell2.product.card.cancel': '取消',
+    'pisell2.product.card.note.pla': '請輸入備註',
+    'pisell2.product.card.items.package': '包含的商品'
   }
 };

package/es/components/productCard/status.d.ts

@@ -0,0 +1,9 @@
+import { ProductCardTypes } from './types';
+/**
+ * @title: 默认数据
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-12 16:49
+ */
+export declare const defaultValue: ProductCardTypes;

package/es/components/productCard/status.js

@@ -0,0 +1,15 @@
+/**
+ * @title: 默认数据
+ * @description: 
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-12 16:49
+ */
+export var defaultValue = {
+  dataSource: {},
+  isShowImage: true,
+  isShowHolder: true,
+  isShowNote: true,
+  isShowDelete: true,
+  isShowPackageNote: true
+};

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

@@ -8,6 +8,7 @@ export declare type ProductCardTypes = {
     isShowNote?: boolean;
     isShowPackageNote?: boolean;
     isShowDelete?: boolean;
+    disabledEdit?: boolean;
     onAction?: (val: any) => void;
     onDelete?: (val: any) => void;
     onNote?: (val: any) => void;

package/lib/components/dataSourceComponents/dataSourceForm/BaseForm.js

@@ -37,7 +37,6 @@ var import_classnames = __toESM(require("classnames"));
 var import_useDataSource = __toESM(require("../hooks/useDataSource"));
 var import_form = __toESM(require("../../form"));
 var import_FormSettingProvider = __toESM(require("./provider/formSetting/FormSettingProvider"));
-var import_useSetRequest = __toESM(require("../../../hooks/useSetRequest"));
 var import_index = require("./index.less");
 var BaseForm = (0, import_react.forwardRef)(
   (props, ref) => {
@@ -55,7 +54,6 @@ var BaseForm = (0, import_react.forwardRef)(
       className,
       ...others
     } = props;
-    (0, import_useSetRequest.default)();
     const formRef = (0, import_react.useRef)(null);
     const { get } = (0, import_useDataSource.default)();
     (0, import_react.useEffect)(() => {

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

@@ -38,8 +38,8 @@ var import_pisellToast = __toESM(require("../../../pisellToast"));
 var import_pisellModal = __toESM(require("../../../pisellModal"));
 var import_formItem = __toESM(require("../formItem"));
 var import_useFormSetting = __toESM(require("../provider/hooks/useFormSetting"));
-var import_useActions = __toESM(require("../../hooks/useActions"));
 var import_useCtxActions = __toESM(require("../../hooks/useCtxActions"));
+var import_useDataSource = __toESM(require("../../hooks/useDataSource"));
 var import_index = require("./index.less");
 var SubmitButton = (props) => {
   const {
@@ -58,15 +58,15 @@ var SubmitButton = (props) => {
   const form = import_antd.Form.useFormInstance();
   const { mode } = (0, import_useFormSetting.default)();
   const { setVisible, refreshTableData } = (0, import_useCtxActions.default)();
-  const { create, update } = (0, import_useActions.default)();
+  const { create, update } = (0, import_useDataSource.default)();
   const isDisabled = status === "disabled";
   const onSubmit = async (values) => {
     try {
       setLoading(true);
       if (mode === "edit") {
-        await update(values);
+        await update.runAsync(values);
       } else if (mode === "add") {
-        const res = await create(values);
+        const res = await create.runAsync(values);
         form == null ? void 0 : form.resetFields();
       }
     } catch (error) {