@pisell/materials 6.0.6 → 6.0.8

package/es/components/config-provider/index.js

@@ -7,7 +7,7 @@ import { ConfigProvider as OriginalConfigProvider } from "antd";
 // 由于 antd 组件的默认文案是英文，所以需要修改为中文
 import dayjs from "dayjs";
 import "dayjs/locale/zh-cn";
-import zhCN from "antd/locale/zh_CN";
+import zhCN from "antd/es/locale/zh_CN";
 var ConfigProvider = function ConfigProvider(props) {
   var locale = props.locale,
     rest = _objectWithoutProperties(props, _excluded);

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

@@ -1,4 +1,4 @@
-var _excluded = ["title", "description", "dataSource", "showTitle", "showDescription", "groupInfoPosition", "variables", "renderMode", "children", "currentValue", "className"];
+var _excluded = ["title", "description", "dataSource", "showTitle", "showDescription", "groupInfoPosition", "variables", "renderMode", "children", "currentValue", "className", "onDataSourceFinish", "formatSubmitValues", "formatInitialValues", "customSubmit"];
 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 _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; }
@@ -7,6 +7,7 @@ import classNames from 'classnames';
 import useDataSource from "../hooks/useDataSource";
 import Form from "../../form";
 import FormSettingProvider from "./provider/formSetting/FormSettingProvider";
+import PageHeader from "../../page-header";
 import "./index.less";
 
 /**
@@ -25,6 +26,10 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     children = props.children,
     currentValue = props.currentValue,
     className = props.className,
+    onDataSourceFinish = props.onDataSourceFinish,
+    formatSubmitValues = props.formatSubmitValues,
+    formatInitialValues = props.formatInitialValues,
+    customSubmit = props.customSubmit,
     others = _objectWithoutProperties(props, _excluded);
   var formRef = useRef(null);
   var _useDataSource = useDataSource(),
@@ -43,25 +48,29 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     if (['edit', 'view'].includes(renderMode || '') && dataSource) {
       get === null || get === void 0 ? void 0 : get.runAsync().then(function (res) {
         var _formRef$current2;
-        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldsValue(res);
+        var formattedValues = formatInitialValues ? formatInitialValues(res) : res;
+        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldsValue(formattedValues);
       });
     }
-  }, [renderMode, dataSource]);
+  }, [renderMode, dataSource, formatInitialValues]);
   return /*#__PURE__*/React.createElement(FormSettingProvider, {
     renderMode: renderMode,
     groupInfoPosition: groupInfoPosition,
     currentValue: currentValue,
-    size: others.size
+    size: others.size,
+    onDataSourceFinish: onDataSourceFinish,
+    formatSubmitValues: formatSubmitValues,
+    formatInitialValues: formatInitialValues,
+    customSubmit: customSubmit
   }, /*#__PURE__*/React.createElement(Form, _extends({}, others, {
     className: classNames('pisell-lowcode-data-source-form', className),
     ref: formRef,
     preserve: true
-  }), (title || description) && /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode-data-source-form-header"
-  }, showTitle && /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode-data-source-form-title"
-  }, title), showDescription && /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode-data-source-form-description"
-  }, description)), children));
+  }), /*#__PURE__*/React.createElement(PageHeader, {
+    title: title,
+    showTitle: showTitle,
+    subTitle: description,
+    showSubTitle: showDescription
+  }), children));
 });
 export default BaseForm;

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

@@ -29,7 +29,7 @@ var FormItem = function FormItem(props) {
     dataSource = _useDataSource.dataSource;
   var fields = dataSource === null || dataSource === void 0 ? void 0 : dataSource.fields;
   var _useFormSetting = useFormSetting(),
-    globalMode = _useFormSetting.mode;
+    globalMode = _useFormSetting.renderMode;
   var field = fields === null || fields === void 0 ? void 0 : fields.find(function (item) {
     return item.name === name;
   });

package/es/components/dataSourceComponents/dataSourceForm/group/index.less

@@ -1,6 +1,6 @@
 .pisell-lowcode-data-source-form-group {
   display: flex;
-  padding: 20px;
+  padding: 20px 20px 0;
   border-radius: 8px;
   border: 1px solid var(--Gray-300, #d0d5dd);
   margin-bottom: 24px;
@@ -26,7 +26,7 @@
     .pisell-lowcode-data-source-form-group-content {
       border: 1px solid var(--Gray-300, #d0d5dd);
       border-radius: 8px;
-      padding: 20px;
+      padding: 20px 20px 0;
     }
   }
   &-info {

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

@@ -12,11 +12,13 @@ import "./index.less";
 var DataSourceForm = /*#__PURE__*/forwardRef(function (props, ref) {
   var dataSource = props.dataSource,
     currentValue = props.currentValue,
-    __designMode = props.__designMode;
+    __designMode = props.__designMode,
+    extraParams = props.extraParams;
   return /*#__PURE__*/React.createElement(DataSourceProvider, {
     dataSource: dataSource,
     currentValue: currentValue,
-    __designMode: __designMode
+    __designMode: __designMode,
+    extraParams: extraParams
   }, /*#__PURE__*/React.createElement(BaseForm, _extends({}, props, {
     ref: ref
   })));

package/es/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingContext.d.ts

@@ -1,11 +1,15 @@
 /// <reference types="react" />
 import { ModeType } from '../../type';
 export interface FormSettingContextType {
+    onDataSourceFinish?: (values: any, result: any) => void;
     renderMode?: ModeType;
     groupInfoPosition?: 'top' | 'side';
     children?: React.ReactNode;
     currentValue?: 'server' | 'local';
     size?: 'small' | 'middle' | 'large';
+    formatSubmitValues?: (values: Record<string, any>) => Record<string, any>;
+    formatInitialValues?: (values: Record<string, any>) => Record<string, any>;
+    customSubmit?: (values: Record<string, any>) => Promise<any>;
 }
 export declare const FormSettingContext: import("react").Context<FormSettingContextType>;
 export default FormSettingContext;

package/es/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingProvider.js

@@ -10,15 +10,23 @@ var FormSettingProvider = function FormSettingProvider(props) {
     renderMode = props.renderMode,
     groupInfoPosition = props.groupInfoPosition,
     currentValue = props.currentValue,
-    size = props.size;
+    size = props.size,
+    onDataSourceFinish = props.onDataSourceFinish,
+    formatSubmitValues = props.formatSubmitValues,
+    formatInitialValues = props.formatInitialValues,
+    customSubmit = props.customSubmit;
   var value = React.useMemo(function () {
     return {
       renderMode: renderMode,
       groupInfoPosition: groupInfoPosition,
       currentValue: currentValue,
-      size: size
+      size: size,
+      onDataSourceFinish: onDataSourceFinish,
+      formatSubmitValues: formatSubmitValues,
+      formatInitialValues: formatInitialValues,
+      customSubmit: customSubmit
     };
-  }, [renderMode, groupInfoPosition, currentValue, size]);
+  }, [renderMode, groupInfoPosition, currentValue, size, onDataSourceFinish, formatSubmitValues, formatInitialValues, customSubmit]);
   return /*#__PURE__*/React.createElement(FormSettingContext.Provider, {
     value: value
   }, children);

package/es/components/dataSourceComponents/dataSourceForm/provider/jsonWrapper/JsonWrapperProvider.js

@@ -1,3 +1,9 @@
+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); }
+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 _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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -11,7 +17,8 @@ import JsonWrapperContext from "./JsonWrapperContext";
 var JsonWrapperProvider = function JsonWrapperProvider(props) {
   var children = props.children,
     prefix = props.prefix,
-    label = props.label;
+    label = props.label,
+    style = props.style;
   var _ref = useContext(JsonWrapperContext) || {},
     _ref$path = _ref.path,
     prefixPath = _ref$path === void 0 ? [] : _ref$path,
@@ -30,9 +37,9 @@ var JsonWrapperProvider = function JsonWrapperProvider(props) {
     value: contextValue
   }, /*#__PURE__*/React.createElement(FormItem, {
     label: label,
-    style: {
+    style: _objectSpread(_objectSpread({}, style || {}), {}, {
       paddingLeft: "".concat(level * 12, "px")
-    }
+    })
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       paddingLeft: "".concat(level * 12, "px")

package/es/components/dataSourceComponents/dataSourceForm/serve.d.ts

@@ -103,7 +103,8 @@ export declare const createNocobaseData: (params: {
  */
 export declare const getNocobaseData: (params: {
     key: string;
-    id: string;
+    query: Record<string, any>;
+    headers?: any;
 }) => Promise<any>;
 /**
  * 自定义api接口
@@ -126,9 +127,9 @@ export declare const customApi: (url: string, data: Record<string, any>, options
  */
 export declare const updateNocobaseData: (params: {
     key: string;
-    id: string;
     data: any;
     headers?: any;
+    query?: Record<string, any> | undefined;
 }) => Promise<any>;
 /**
  * 获取nocobase数据列表

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

@@ -4,6 +4,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -98,19 +104,29 @@ export var createNocobaseData = /*#__PURE__*/function () {
     return _ref4.apply(this, arguments);
   };
 }();
+var formatQueryObjString = function formatQueryObjString() {
+  var query = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return Object.entries(query || {}).map(function (_ref5) {
+    var _ref6 = _slicedToArray(_ref5, 2),
+      key = _ref6[0],
+      value = _ref6[1];
+    return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
+  }).join('&');
+};
 
 /**
  * nocobase get数据
  */
 export var getNocobaseData = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
-    var key, id;
+  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
+    var key, query, headers;
     return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          key = params.key, id = params.id;
-          return _context5.abrupt("return", request.getRequest().get("/".concat(key, ":get?filterByTk=").concat(id), {}, {
-            isNocobase: true
+          key = params.key, query = params.query, headers = params.headers;
+          return _context5.abrupt("return", request.getRequest().get("/".concat(key, ":get?").concat(formatQueryObjString(query)), {}, {
+            isNocobase: true,
+            headers: headers
           }));
         case 2:
         case "end":
@@ -119,7 +135,7 @@ export var getNocobaseData = /*#__PURE__*/function () {
     }, _callee5);
   }));
   return function getNocobaseData(_x2) {
-    return _ref5.apply(this, arguments);
+    return _ref7.apply(this, arguments);
   };
 }();
 
@@ -138,9 +154,9 @@ var formatHeaders = function formatHeaders(headers) {
 };
 var formatQueryString = function formatQueryString() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return params.map(function (_ref6) {
-    var name = _ref6.name,
-      value = _ref6.value;
+  return params.map(function (_ref8) {
+    var name = _ref8.name,
+      value = _ref8.value;
     return "".concat(encodeURIComponent(name), "=").concat(encodeURIComponent(value));
   }).join('&');
 };
@@ -153,7 +169,7 @@ var formatRequestUrl = function formatRequestUrl(url, baseUrl, queryString) {
  * 自定义api接口
  */
 export var customApi = /*#__PURE__*/function () {
-  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(url, data, options) {
+  var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(url, data, options) {
     var method, baseUrl, _options$headers, headers, _options$params, params, _options$body, body, requestHeaders, queryString, requestUrl, requestData, requestMethod;
     return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
@@ -175,7 +191,7 @@ export var customApi = /*#__PURE__*/function () {
     }, _callee6);
   }));
   return function customApi(_x3, _x4, _x5) {
-    return _ref7.apply(this, arguments);
+    return _ref9.apply(this, arguments);
   };
 }();
 
@@ -183,13 +199,13 @@ export var customApi = /*#__PURE__*/function () {
  * 更新nocobase数据
  */
 export var updateNocobaseData = /*#__PURE__*/function () {
-  var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-    var key, id, data, headers;
+  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
+    var key, data, headers, query;
     return _regeneratorRuntime().wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
-          key = params.key, id = params.id, data = params.data, headers = params.headers;
-          return _context7.abrupt("return", request.getRequest().post("/".concat(key, ":update?filterByTk=").concat(id), data, {
+          key = params.key, data = params.data, headers = params.headers, query = params.query;
+          return _context7.abrupt("return", request.getRequest().post("/".concat(key, ":update?").concat(formatQueryObjString(query)), data, {
             isNocobase: true,
             headers: headers
           }));
@@ -200,7 +216,7 @@ export var updateNocobaseData = /*#__PURE__*/function () {
     }, _callee7);
   }));
   return function updateNocobaseData(_x6) {
-    return _ref8.apply(this, arguments);
+    return _ref10.apply(this, arguments);
   };
 }();
 
@@ -208,7 +224,7 @@ export var updateNocobaseData = /*#__PURE__*/function () {
  * 获取nocobase数据列表
  */
 export var getNocobaseDataList = /*#__PURE__*/function () {
-  var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(allParams) {
+  var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(allParams) {
     var key, params, headers;
     return _regeneratorRuntime().wrap(function _callee8$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
@@ -226,7 +242,7 @@ export var getNocobaseDataList = /*#__PURE__*/function () {
     }, _callee8);
   }));
   return function getNocobaseDataList(_x7) {
-    return _ref9.apply(this, arguments);
+    return _ref11.apply(this, arguments);
   };
 }();
 
@@ -234,7 +250,7 @@ export var getNocobaseDataList = /*#__PURE__*/function () {
  * 删除nocobase数据
  */
 export var deleteNocobaseData = /*#__PURE__*/function () {
-  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(key, id, headers) {
+  var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(key, id, headers) {
     return _regeneratorRuntime().wrap(function _callee9$(_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
@@ -249,6 +265,6 @@ export var deleteNocobaseData = /*#__PURE__*/function () {
     }, _callee9);
   }));
   return function deleteNocobaseData(_x8, _x9, _x10) {
-    return _ref10.apply(this, arguments);
+    return _ref12.apply(this, arguments);
   };
 }();

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

@@ -16,6 +16,7 @@ import FormItem from "../formItem";
 import useFormSetting from "../provider/hooks/useFormSetting";
 import useCtxActions from "../../hooks/useCtxActions";
 import useDataSource from "../../hooks/useDataSource";
+import { filterSystemFields } from "../utils";
 import "./index.less";
 // 表单提交按钮
 var SubmitButton = function SubmitButton(props) {
@@ -39,7 +40,10 @@ var SubmitButton = function SubmitButton(props) {
     contextHolder = _notification$useNoti2[1];
   var form = Form.useFormInstance();
   var _useFormSetting = useFormSetting(),
-    renderMode = _useFormSetting.renderMode;
+    renderMode = _useFormSetting.renderMode,
+    onDataSourceFinish = _useFormSetting.onDataSourceFinish,
+    formatSubmitValues = _useFormSetting.formatSubmitValues,
+    customSubmit = _useFormSetting.customSubmit;
   var _useCtxActions = useCtxActions(),
     setVisible = _useCtxActions.setVisible,
     refreshTableData = _useCtxActions.refreshTableData;
@@ -55,34 +59,43 @@ var SubmitButton = function SubmitButton(props) {
           case 0:
             setLoading(true);
             _context.prev = 1;
-            if (!(renderMode === 'edit')) {
-              _context.next = 7;
+            if (!customSubmit) {
+              _context.next = 6;
               break;
             }
             _context.next = 5;
-            return update.runAsync(values);
+            return customSubmit(values);
           case 5:
-            _context.next = 12;
-            break;
-          case 7:
-            if (!(renderMode === 'add')) {
+            return _context.abrupt("return", _context.sent);
+          case 6:
+            if (!(renderMode === 'edit')) {
               _context.next = 12;
               break;
             }
-            _context.next = 10;
+            _context.next = 9;
+            return update.runAsync(values);
+          case 9:
+            return _context.abrupt("return", _context.sent);
+          case 12:
+            if (!(renderMode === 'add')) {
+              _context.next = 18;
+              break;
+            }
+            _context.next = 15;
             return create.runAsync(values);
-          case 10:
+          case 15:
             res = _context.sent;
             form === null || form === void 0 ? void 0 : form.resetFields();
-          case 12:
-            _context.prev = 12;
+            return _context.abrupt("return", res);
+          case 18:
+            _context.prev = 18;
             setLoading(false);
-            return _context.finish(12);
-          case 15:
+            return _context.finish(18);
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 12, 15]]);
+      }, _callee, null, [[1,, 18, 21]]);
     }));
     return function onSubmit(_x2) {
       return _ref.apply(this, arguments);
@@ -116,7 +129,7 @@ var SubmitButton = function SubmitButton(props) {
   // 验证表单并提交
   var handleValideFieldsSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
-      var allValues, afterSubmitFunc;
+      var allValues, filteredValues, formattedValues, result, afterSubmitFunc;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -134,9 +147,16 @@ var SubmitButton = function SubmitButton(props) {
                 content: toastConfig.title
               });
             }
-            _context2.next = 8;
-            return onSubmit(values);
-          case 8:
+            filteredValues = filterSystemFields(allValues); // 格式化提交数据
+            formattedValues = formatSubmitValues ? formatSubmitValues(filteredValues) : filteredValues;
+            _context2.next = 10;
+            return onSubmit(formattedValues);
+          case 10:
+            result = _context2.sent;
+            // 数据源提交成功
+            if (onDataSourceFinish) {
+              onDataSourceFinish(formattedValues, result);
+            }
             if (refreshData) {
               refreshTableData === null || refreshTableData === void 0 ? void 0 : refreshTableData();
             }
@@ -151,19 +171,19 @@ var SubmitButton = function SubmitButton(props) {
                 afterSubmitFunc();
               }
             }
-            _context2.next = 16;
+            _context2.next = 20;
             break;
-          case 13:
-            _context2.prev = 13;
+          case 17:
+            _context2.prev = 17;
             _context2.t0 = _context2["catch"](0);
             PisellToast({
               content: "".concat(_context2.t0.message)
             });
-          case 16:
+          case 20:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 13]]);
+      }, _callee2, null, [[0, 17]]);
     }));
     return function handleValideFieldsSubmit(_x3) {
       return _ref2.apply(this, arguments);
@@ -216,7 +236,8 @@ var SubmitButton = function SubmitButton(props) {
     size: "large",
     loading: loading,
     onClick: onSubmitClick,
-    disabled: isDisabled
+    disabled: isDisabled,
+    htmlType: "submit"
   }, childrenString), contextHolder));
 };
 export default SubmitButton;

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

@@ -5,6 +5,7 @@ export interface DataSourceFormProps {
     title: string;
     description: string;
     dataSource: DataSourceType;
+    extraParams?: Record<string, any>;
     showTitle: boolean;
     showDescription: boolean;
     groupInfoPosition: 'top' | 'side';
@@ -14,5 +15,9 @@ export interface DataSourceFormProps {
     children: React.ReactNode;
     className?: string;
     size?: 'small' | 'middle' | 'large';
+    onDataSourceFinish?: (values: any, result: any) => void;
     __designMode?: string;
+    formatSubmitValues?: (values: Record<string, any>) => Record<string, any>;
+    formatInitialValues?: (values: Record<string, any>) => Record<string, any>;
+    customSubmit?: (values: Record<string, any>) => Promise<any>;
 }

package/es/components/dataSourceComponents/dataSourceForm/utils.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ModeType } from './type';
-import "./style.less";
+import './style.less';
 export interface WithModeProps {
     renderMode?: ModeType;
     value?: any;
@@ -25,6 +25,7 @@ export interface WithFormItemProps {
 }
 export declare const formItemNameReplace: (name: string) => string;
 export declare const formItemNameReverse: (name: string) => string;
+export declare const isValidDomain: (value: string) => boolean;
 /**
  * @title: 追加formItem层
  * @description:
@@ -48,3 +49,4 @@ export declare const withOptions: <P extends unknown>(WrappedComponent: React.Co
 export declare const getNestedValue: (obj: Record<string, any>, path: string) => Record<string, any>;
 export declare const renderValueWithMap: (value: any, valueMap?: Record<string, string>, renderMode?: ModeType) => React.JSX.Element | null;
 export declare function toArr(str: string | number | (string | number)[]): (string | number)[];
+export declare const filterSystemFields: (params: Record<string, any>) => Record<string, any>;