@pisell/materials 1.0.458 → 1.0.459

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/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/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/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) {

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

@@ -42,10 +42,10 @@ var import_ActionsProvider = __toESM(require("../provider/actions/ActionsProvide
 var import_useDrawerState = __toESM(require("./hooks/useDrawerState"));
 var import_useDesignMode = __toESM(require("./hooks/useDesignMode"));
 var import_useTableQuery = __toESM(require("./hooks/useTableQuery"));
-var import_useSetRequest = __toESM(require("../../../hooks/useSetRequest"));
 var import_locales = require("../../../locales");
 var import_useDataSource = __toESM(require("../hooks/useDataSource"));
 var import_TableSettingProvider = __toESM(require("./provider/tableSetting/TableSettingProvider"));
+var import_useDataSourceKey = __toESM(require("./hooks/useDataSourceKey"));
 var DRAWER_TITLES = {
   detail: (0, import_locales.getText)("pisell-data-source-table-detail"),
   edit: (0, import_locales.getText)("pisell-data-source-table-edit"),
@@ -65,10 +65,10 @@ var BaseTable = (props) => {
     __designMode,
     ...others
   } = props;
-  (0, import_useSetRequest.default)();
   const { registerVariable } = (0, import_useVariables.default)();
   const { list, destroy } = (0, import_useDataSource.default)();
   const { data } = list;
+  const { dataSourceKey, dataSourceKeyRef } = (0, import_useDataSourceKey.default)();
   const {
     drawerVisible,
     setDrawerVisible,
@@ -77,14 +77,22 @@ var BaseTable = (props) => {
     closeDrawer
   } = (0, import_useDrawerState.default)();
   const { queryPageConfig, handleValuesChange, refreshData } = (0, import_useTableQuery.default)();
-  (0, import_useDesignMode.default)(props, { registerVariable, openDrawer, closeDrawer, data: data == null ? void 0 : data.data });
+  (0, import_useDesignMode.default)(props, {
+    registerVariable,
+    openDrawer,
+    closeDrawer,
+    data: data == null ? void 0 : data.data
+  });
+  (0, import_react.useEffect)(() => {
+    refreshData();
+  }, [dataSourceKey]);
   (0, import_react.useEffect)(() => {
-    if (dataSource) {
+    if (dataSourceKeyRef.current) {
       list == null ? void 0 : list.run(queryPageConfig);
     } else {
       list == null ? void 0 : list.mutate([]);
     }
-  }, [dataSource, list == null ? void 0 : list.run, queryPageConfig]);
+  }, [queryPageConfig]);
   const handleOpenDrawer = (record, type) => {
     openDrawer(type);
     registerVariable == null ? void 0 : registerVariable({
@@ -98,13 +106,18 @@ var BaseTable = (props) => {
     });
   };
   const handleDelete = async (record) => {
-    registerVariable == null ? void 0 : registerVariable({
-      currentRecord: record
-    });
-    setTimeout(async () => {
-      await (destroy == null ? void 0 : destroy.run(record.id));
-      refreshData();
-    });
+    try {
+      registerVariable == null ? void 0 : registerVariable({
+        currentRecord: record
+      });
+      setTimeout(async () => {
+        await (destroy == null ? void 0 : destroy.run(record.id));
+        refreshData();
+      });
+    } catch (error) {
+      console.error(error);
+      import_antd.message.error("删除失败,请重试");
+    }
   };
   const actionsColumns = (0, import_react.useMemo)(() => {
     return [
@@ -140,15 +153,15 @@ var BaseTable = (props) => {
     // 操作列
     actionsColumns
   });
-  const pagination = (0, import_usePagination.default)({ data: data == null ? void 0 : data.data });
-  const getDrawerContent = (type) => {
+  const pagination = (0, import_usePagination.default)({ data });
+  const drawerContent = (0, import_react.useMemo)(() => {
     const contentMap = {
       detail: detailContent,
       edit: editContent,
       add: addContent
     };
-    return contentMap[type];
-  };
+    return contentMap[drawerType];
+  }, [drawerType, detailContent, editContent, addContent]);
   return /* @__PURE__ */ import_react.default.createElement(import_TableSettingProvider.default, null, showAddButton && /* @__PURE__ */ import_react.default.createElement("div", { style: { marginBottom: 16 } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "primary", onClick: () => handleOpenDrawer(null, "add") }, (0, import_locales.getText)("pisell-data-source-table-add"))), /* @__PURE__ */ import_react.default.createElement(
     import_table.default,
     {
@@ -174,7 +187,7 @@ var BaseTable = (props) => {
         onClose: handleCloseDrawer,
         destroyOnClose: true
       },
-      getDrawerContent(drawerType)
+      drawerContent
     )
   ));
 };

package/lib/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/lib/components/dataSourceComponents/dataSourceTable/hooks/useDataSourceKey.js

@@ -0,0 +1,50 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/dataSourceComponents/dataSourceTable/hooks/useDataSourceKey.ts
+var useDataSourceKey_exports = {};
+__export(useDataSourceKey_exports, {
+  default: () => useDataSourceKey_default
+});
+module.exports = __toCommonJS(useDataSourceKey_exports);
+var import_react = require("react");
+var import_utils = require("@pisell/utils");
+var import_useDataSource = __toESM(require("../../hooks/useDataSource"));
+var useDataSourceKey = () => {
+  const { dataSource } = (0, import_useDataSource.default)();
+  const dataSourceKey = (0, import_react.useMemo)(() => {
+    return (0, import_utils.isString)(dataSource) ? dataSource : dataSource == null ? void 0 : dataSource.key;
+  }, [dataSource]);
+  const dataSourceKeyRef = (0, import_react.useRef)(dataSourceKey);
+  dataSourceKeyRef.current = dataSourceKey;
+  return {
+    dataSourceKey,
+    dataSourceKeyRef
+  };
+};
+var useDataSourceKey_default = useDataSourceKey;

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

@@ -131,7 +131,7 @@ var useActions = ({
       const id = values == null ? void 0 : values.id;
       if (!id) {
         import_antd.message.error("请先获取数据");
-        return {};
+        return Promise.reject();
       }
       return (0, import_serve.updateNocobaseData)({
         key: name,

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

@@ -39,8 +39,10 @@ var import_DataSourceContext = __toESM(require("./DataSourceContext"));
 var import_useActions = __toESM(require("../../hooks/useActions"));
 var import_useVariables = __toESM(require("../../hooks/useVariables"));
 var import_useDataSource = __toESM(require("../../hooks/useDataSource"));
+var import_useSetRequest = __toESM(require("../../../../hooks/useSetRequest"));
 var DataSourceProvider = (props) => {
   const { children, dataSource: propsDataSource, currentValue } = props;
+  (0, import_useSetRequest.default)();
   const { parseVariable } = (0, import_useVariables.default)();
   const { dataSource: ctxDataSource } = (0, import_useDataSource.default)();
   const dataSource = (0, import_utils.isString)(propsDataSource) ? parseVariable == null ? void 0 : parseVariable(propsDataSource, {
@@ -48,7 +50,6 @@ var DataSourceProvider = (props) => {
       currentDataSource: ctxDataSource
     }
   }) : propsDataSource;
-  console.log(dataSource, "dataSource");
   const { list, get, update, create, destroy } = (0, import_useActions.default)({
     dataSource,
     currentValue

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

@@ -34,17 +34,18 @@ __export(Packages_exports, {
 module.exports = __toCommonJS(Packages_exports);
 var import_react = __toESM(require("react"));
 var import_Divider = __toESM(require("../Divider"));
+var import_utils = require("@pisell/utils");
 var import_collapsibleList = __toESM(require("./components/collapsibleList"));
-var import_utils = require("./components/collapsibleList/utils");
+var import_utils2 = require("./components/collapsibleList/utils");
 var import_index = require("./index.less");
 var prefix = "pisell-lowcode-";
 var Packages = ({ item, isShowPackageNote }) => {
   const bundle = (item == null ? void 0 : item.bundle) || [];
-  return (bundle == null ? void 0 : bundle.length) > 0 ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Divider.default, null), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-packages-wrap` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-packages-title` }, "Items in package"), /* @__PURE__ */ import_react.default.createElement(
+  return (bundle == null ? void 0 : bundle.length) > 0 ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Divider.default, null), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-packages-wrap` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-packages-title` }, import_utils.locales.getText("pisell2.product.card.items.package")), /* @__PURE__ */ import_react.default.createElement(
     import_collapsibleList.default,
     {
       list: bundle || [],
-      renderItem: (items) => (0, import_utils.renderBundles)(
+      renderItem: (items) => (0, import_utils2.renderBundles)(
         { ...items, symbol: item == null ? void 0 : item.symbol, total: items == null ? void 0 : items.price },
         false,
         isShowPackageNote