@pisell/materials 1.0.539 → 1.0.541

package/es/components/dataSourceComponents/dataSourceForm/submitButton/index.d.ts

@@ -33,6 +33,7 @@ export interface SubmitButtonProps extends ButtonProps {
         duration: number;
         placement: 'top' | 'topLeft' | 'topRight' | 'bottom' | 'bottomLeft' | 'bottomRight';
     };
+    customSubmit?: (values: Record<string, any>) => void;
 }
 declare const SubmitButton: (props: SubmitButtonProps) => React.JSX.Element | null;
 export default SubmitButton;

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

@@ -29,7 +29,8 @@ var SubmitButton = function SubmitButton(props) {
     afterSubmitType = props.afterSubmitType,
     afterSubmitModalConfig = props.afterSubmitModalConfig,
     afterSubmitNotificationConfig = props.afterSubmitNotificationConfig,
-    childrenString = props.childrenString;
+    childrenString = props.childrenString,
+    customSubmit = props.customSubmit;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -57,34 +58,43 @@ var SubmitButton = function SubmitButton(props) {
           case 0:
             setLoading(true);
             _context.prev = 1;
-            if (!(renderMode === 'edit')) {
-              _context.next = 8;
+            if (!customSubmit) {
+              _context.next = 6;
               break;
             }
             _context.next = 5;
-            return update.runAsync(values);
+            return customSubmit(values);
           case 5:
             return _context.abrupt("return", _context.sent);
-          case 8:
+          case 6:
+            if (!(renderMode === 'edit')) {
+              _context.next = 12;
+              break;
+            }
+            _context.next = 9;
+            return update.runAsync(values);
+          case 9:
+            return _context.abrupt("return", _context.sent);
+          case 12:
             if (!(renderMode === 'add')) {
-              _context.next = 14;
+              _context.next = 18;
               break;
             }
-            _context.next = 11;
+            _context.next = 15;
             return create.runAsync(values);
-          case 11:
+          case 15:
             res = _context.sent;
             form === null || form === void 0 ? void 0 : form.resetFields();
             return _context.abrupt("return", res);
-          case 14:
-            _context.prev = 14;
+          case 18:
+            _context.prev = 18;
             setLoading(false);
-            return _context.finish(14);
-          case 17:
+            return _context.finish(18);
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 14, 17]]);
+      }, _callee, null, [[1,, 18, 21]]);
     }));
     return function onSubmit(_x2) {
       return _ref.apply(this, arguments);

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

@@ -46,7 +46,10 @@ var useColumns = function useColumns(_ref) {
       var fieldProps = genFieldProps(field, (_other = column.other) === null || _other === void 0 ? void 0 : _other.fieldProps);
       return _objectSpread(_objectSpread({}, column), {}, {
         title: title,
-        render: function render(text) {
+        render: function render(text, record, index) {
+          if (column !== null && column !== void 0 && column.render) {
+            return column.render(text, record, index);
+          }
           return /*#__PURE__*/React.createElement(FieldComponent, _extends({}, fieldProps, {
             value: text
           }));

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

@@ -94,9 +94,9 @@ var useTableProps = function useTableProps(props) {
 
   // 打开抽屉
   var handleOpenDrawer = useMemoizedFn(function (record, item) {
+    var _item$onClick;
+    item === null || item === void 0 ? void 0 : (_item$onClick = item.onClick) === null || _item$onClick === void 0 ? void 0 : _item$onClick.call(item, record);
     if (item.openMode === 'custom') {
-      var _item$onClick;
-      item === null || item === void 0 ? void 0 : (_item$onClick = item.onClick) === null || _item$onClick === void 0 ? void 0 : _item$onClick.call(item, record);
       return;
     }
     registerValueVariable === null || registerValueVariable === void 0 ? void 0 : registerValueVariable(componentId, {
@@ -224,7 +224,7 @@ var useTableProps = function useTableProps(props) {
       var actionType = button.actionType,
         buttonProps = button.buttonProps;
       return _objectSpread(_objectSpread(_objectSpread({}, button), buttonProps), {}, {
-        size: "large",
+        size: 'large',
         title: button.label,
         onClick: function onClick() {
           if (actionType === 'add') {

package/lib/components/dataSourceComponents/dataSourceForm/submitButton/index.d.ts

@@ -33,6 +33,7 @@ export interface SubmitButtonProps extends ButtonProps {
         duration: number;
         placement: 'top' | 'topLeft' | 'topRight' | 'bottom' | 'bottomLeft' | 'bottomRight';
     };
+    customSubmit?: (values: Record<string, any>) => void;
 }
 declare const SubmitButton: (props: SubmitButtonProps) => React.JSX.Element | null;
 export default SubmitButton;

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

@@ -53,7 +53,8 @@ var SubmitButton = (props) => {
     afterSubmitType,
     afterSubmitModalConfig,
     afterSubmitNotificationConfig,
-    childrenString
+    childrenString,
+    customSubmit
   } = props;
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [api, contextHolder] = import_antd.notification.useNotification();
@@ -65,6 +66,9 @@ var SubmitButton = (props) => {
   const onSubmit = async (values) => {
     setLoading(true);
     try {
+      if (customSubmit) {
+        return await customSubmit(values);
+      }
       if (renderMode === "edit") {
         return await update.runAsync(values);
       } else if (renderMode === "add") {

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

@@ -80,7 +80,10 @@ var useColumns = ({
       return {
         ...column,
         title,
-        render: (text) => {
+        render: (text, record, index) => {
+          if (column == null ? void 0 : column.render) {
+            return column.render(text, record, index);
+          }
           return /* @__PURE__ */ import_react.default.createElement(FieldComponent, { ...fieldProps, value: text });
         }
       };

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

@@ -103,8 +103,8 @@ var useTableProps = (props) => {
   }, [propsSubTitle]);
   const handleOpenDrawer = (0, import_ahooks.useMemoizedFn)((record, item) => {
     var _a2;
+    (_a2 = item == null ? void 0 : item.onClick) == null ? void 0 : _a2.call(item, record);
     if (item.openMode === "custom") {
-      (_a2 = item == null ? void 0 : item.onClick) == null ? void 0 : _a2.call(item, record);
       return;
     }
     registerValueVariable == null ? void 0 : registerValueVariable(componentId, {

package/lowcode/submit-button/meta.ts

@@ -763,6 +763,12 @@ const SubmitButtonMeta: ComponentMetadata = {
                 'target => !!target.getProps().getPropValue("href")?.trim()',
             },
           },
+          {
+            name: 'customSubmit',
+            title: '自定义提交',
+            propType: 'func',
+            setter: 'FunctionSetter',
+          },
         ],
       },
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.539",
+  "version": "1.0.541",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",