@pisell/materials 6.6.2 → 6.6.4

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

@@ -1,9 +1,14 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["title", "description", "dataSource", "showTitle", "showDescription", "groupInfoPosition", "variables", "renderMode", "children", "currentValue", "className", "onDataSourceFinish", "formatSubmitValues", "formatInitialValues", "customSubmit", "leaveConfirmConfig"];
+var _excluded = ["title", "description", "dataSource", "showTitle", "showDescription", "groupInfoPosition", "variables", "renderMode", "children", "currentValue", "className", "onDataSourceFinish", "formatSubmitValues", "formatInitialValues", "customSubmit", "beforeSubmit", "leaveConfirmConfig"];
 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 _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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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); }); }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
@@ -17,7 +22,10 @@ import Form from "../../form";
 import FormSettingProvider from "./provider/formSetting/FormSettingProvider";
 import PageHeader from "../../page-header";
 import { transformFormObjToArrayWithUntouched } from "./utils";
+import { getFormSettingMetaData } from "./serve";
+import { getFormSettingParams } from "./urlUtils";
 import "./index.less";
+import { isArr } from "@pisell/utils";
 /**
  * @title: 数据源表单组件
  * @description: 基于数据源动态生成表单，支持编辑、查看、禁用三种模式
@@ -39,6 +47,7 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     formatSubmitValues = props.formatSubmitValues,
     formatInitialValues = props.formatInitialValues,
     customSubmit = props.customSubmit,
+    beforeSubmit = props.beforeSubmit,
     leaveConfirmConfig = props.leaveConfirmConfig,
     others = _objectWithoutProperties(props, _excluded);
   var context = useEngineContext();
@@ -64,22 +73,74 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   useEffect(function () {
     if (['edit', 'view'].includes(renderMode || '') && dataSource) {
+      if (dataSource !== null && dataSource !== void 0 && dataSource.fromSettingMeta) {
+        var _dataSource$fields;
+        if (props.__designMode === 'design') return;
+        // 从URL获取参数
+        var _getFormSettingParams = getFormSettingParams(),
+          businessCode = _getFormSettingParams.businessCode,
+          channelCode = _getFormSettingParams.channelCode,
+          isBoard = _getFormSettingParams.isBoard;
+        var sectionCodes = Array.from(new Set(dataSource === null || dataSource === void 0 || (_dataSource$fields = dataSource.fields) === null || _dataSource$fields === void 0 ? void 0 : _dataSource$fields.map(function (field) {
+          return field.name.split('.').shift();
+        })));
+
+        // 使用API方法获取formSettingMeta数据（必须传入参数）
+        getFormSettingMetaData({
+          sectionCodes: sectionCodes,
+          businessCode: businessCode,
+          channelCode: channelCode,
+          isBoard: isBoard
+        }).then(function (res) {
+          var _dataSource$fields2, _formRef$current2;
+          var formattedValues = formatInitialValues ? formatInitialValues(res.data) : res.data || {};
+
+          // 根据 dataSource.fields 筛选 formattedValues
+          var fieldNames = new Set((dataSource === null || dataSource === void 0 || (_dataSource$fields2 = dataSource.fields) === null || _dataSource$fields2 === void 0 ? void 0 : _dataSource$fields2.map(function (field) {
+            return field.name;
+          })) || []);
+          var filteredValues = Object.keys(formattedValues).reduce(function (acc, key) {
+            if (fieldNames.has(key)) {
+              acc[key] = formattedValues[key];
+            }
+            return acc;
+          }, {});
+          (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFields(transformFormObjToArrayWithUntouched(_objectSpread({}, filteredValues)));
+        }).catch(function (error) {
+          console.error('获取formSettingMeta数据失败:', error);
+        });
+        return;
+      }
       get === null || get === void 0 || get.runAsync().then(function (res) {
-        var _formRef$current2;
+        var _formRef$current3;
         var formattedValues = formatInitialValues ? formatInitialValues(res) : res;
-        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFields(transformFormObjToArrayWithUntouched(formattedValues));
+        var values = formattedValues;
+        if (isArr(dataSource === null || dataSource === void 0 ? void 0 : dataSource.fields)) {
+          var _dataSource$fields3;
+          // 根据 dataSource.fields 筛选 formattedValues
+          var fieldNames = new Set((dataSource === null || dataSource === void 0 || (_dataSource$fields3 = dataSource.fields) === null || _dataSource$fields3 === void 0 ? void 0 : _dataSource$fields3.map(function (field) {
+            return field.name;
+          })) || []);
+          values = Object.keys(formattedValues).reduce(function (acc, key) {
+            if (fieldNames.has(key)) {
+              acc[key] = formattedValues[key];
+            }
+            return acc;
+          }, {});
+        }
+        (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.setFields(transformFormObjToArrayWithUntouched(values));
       });
     }
   }, [renderMode, dataSource]);
 
   // 检查表单是否可以关闭
   var checkFormClose = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _formRef$current3;
+    var _formRef$current4;
     var isFormChanged;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          isFormChanged = (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.isFieldsTouched();
+          isFormChanged = (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.isFieldsTouched();
           if (!isFormChanged) {
             _context.next = 3;
             break;
@@ -91,8 +152,8 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
               okText: leaveConfirmConfig === null || leaveConfirmConfig === void 0 ? void 0 : leaveConfirmConfig.okText,
               cancelText: leaveConfirmConfig === null || leaveConfirmConfig === void 0 ? void 0 : leaveConfirmConfig.cancelText,
               onOk: function onOk() {
-                var _formRef$current4;
-                (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 || _formRef$current4.resetFields();
+                var _formRef$current5;
+                (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 || _formRef$current5.resetFields();
                 resolve(true);
               },
               onCancel: function onCancel() {
@@ -118,8 +179,8 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
       var _getApp;
       var history = getApp === null || getApp === void 0 || (_getApp = getApp()) === null || _getApp === void 0 || (_getApp = _getApp.history) === null || _getApp === void 0 ? void 0 : _getApp.instance;
       var unblock = history === null || history === void 0 ? void 0 : history.block(function (location, action) {
-        var _formRef$current5;
-        var isFormChanged = (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.isFieldsTouched();
+        var _formRef$current6;
+        var isFormChanged = (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.isFieldsTouched();
         if (isFormChanged) {
           PisellModal.confirm({
             title: leaveConfirmConfig.title,
@@ -155,7 +216,8 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     onDataSourceFinish: onDataSourceFinish,
     formatSubmitValues: formatSubmitValues,
     formatInitialValues: formatInitialValues,
-    customSubmit: customSubmit
+    customSubmit: customSubmit,
+    beforeSubmit: beforeSubmit
   }, /*#__PURE__*/React.createElement(Form, _extends({}, others, {
     className: classNames('pisell-lowcode-data-source-form', className),
     ref: formRef,

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const FormItem: (props: any) => JSX.Element;
 export default FormItem;

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

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

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

@@ -267,4 +267,97 @@ export var deleteNocobaseData = /*#__PURE__*/function () {
   return function deleteNocobaseData(_x8, _x9, _x10) {
     return _ref12.apply(this, arguments);
   };
+}();
+
+/**
+ * 获取formSettingMeta数据
+ * @param params 请求参数
+ * @param params.sectionCodes 配置段代码数组，如 ['payment']
+ * @param params.businessCode 业务代码
+ * @param params.channelCode 渠道代码
+ * @param params.isBoard 是否包含board_code参数
+ * @returns Promise<any> 返回设置元数据
+ */
+export var getFormSettingMetaData = /*#__PURE__*/function () {
+  var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
+    var sectionCodes, businessCode, channelCode, isBoard, queryParams, url;
+    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
+        case 0:
+          console.log('getFormSettingMetaData', params);
+          sectionCodes = params.sectionCodes, businessCode = params.businessCode, channelCode = params.channelCode, isBoard = params.isBoard; // 构建查询参数
+          queryParams = new URLSearchParams(); // 添加section_code参数（支持多个值）
+          sectionCodes.forEach(function (code) {
+            queryParams.append('section_code[]', code);
+          });
+
+          // 添加business_code参数
+          if (businessCode) {
+            queryParams.append('business_code', businessCode);
+          }
+
+          // 添加channel_code参数
+          if (channelCode) {
+            queryParams.append('channel_code', channelCode);
+          }
+
+          // 当需要包含board_code时，格式为 business_code+channel_code
+          if (isBoard && businessCode && channelCode) {
+            queryParams.append('board_code', "".concat(businessCode, "+").concat(channelCode));
+          }
+          url = "/tenant/setting?".concat(queryParams.toString());
+          return _context10.abrupt("return", request.getRequest().get(url, {}, {
+            headers: {
+              'Content-Type': 'application/json'
+            }
+          }));
+        case 9:
+        case "end":
+          return _context10.stop();
+      }
+    }, _callee10);
+  }));
+  return function getFormSettingMetaData(_x11) {
+    return _ref13.apply(this, arguments);
+  };
+}();
+
+/**
+ * 更新租户设置数据
+ * @param params 请求参数
+ * @param params.businessCode 业务代码
+ * @param params.channelCode 渠道代码
+ * @param params.boardCode 板块代码
+ * @param params.data 要更新的数据对象，如 {"order.prefix":"","order.suffix":"","payment.number":""}
+ * @returns Promise<any> 返回更新结果
+ */
+export var updateTenantSetting = /*#__PURE__*/function () {
+  var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(params) {
+    var business_code, channel_code, board_code, data, requestBody, url;
+    return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+      while (1) switch (_context11.prev = _context11.next) {
+        case 0:
+          console.log('updateTenantSetting', params);
+          business_code = params.business_code, channel_code = params.channel_code, board_code = params.board_code, data = params.data; // 构建请求体，按照 curl 请求的格式
+          requestBody = {
+            business_code: business_code,
+            channel_code: channel_code,
+            board_code: board_code,
+            data: data
+          };
+          url = '/tenant/setting';
+          return _context11.abrupt("return", request.getRequest().post(url, requestBody, {
+            headers: {
+              'Content-Type': 'application/json'
+            }
+          }));
+        case 5:
+        case "end":
+          return _context11.stop();
+      }
+    }, _callee11);
+  }));
+  return function updateTenantSetting(_x12) {
+    return _ref14.apply(this, arguments);
+  };
 }();

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

@@ -17,7 +17,9 @@ import useFormSetting from "../provider/hooks/useFormSetting";
 import useCtxActions from "../../hooks/useCtxActions";
 import useDataSource from "../../hooks/useDataSource";
 import { filterSystemFields, setFormFieldsUntouched } from "../utils";
+import { getFormSettingParams } from "../urlUtils";
 import "./index.less";
+import { updateTenantSetting } from "../serve";
 // 表单提交按钮
 var SubmitButton = function SubmitButton(props) {
   var children = props.children,
@@ -43,59 +45,80 @@ var SubmitButton = function SubmitButton(props) {
     renderMode = _useFormSetting.renderMode,
     onDataSourceFinish = _useFormSetting.onDataSourceFinish,
     formatSubmitValues = _useFormSetting.formatSubmitValues,
-    customSubmit = _useFormSetting.customSubmit;
+    customSubmit = _useFormSetting.customSubmit,
+    beforeSubmit = _useFormSetting.beforeSubmit;
   var _useCtxActions = useCtxActions(),
     setVisible = _useCtxActions.setVisible,
     refreshTableData = _useCtxActions.refreshTableData;
   var _useDataSource = useDataSource(),
     create = _useDataSource.create,
-    update = _useDataSource.update;
+    update = _useDataSource.update,
+    dataSource = _useDataSource.dataSource;
   var isDisabled = status === 'disabled';
   var onSubmit = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
-      var res;
+      var urlParams, business_code, channel_code, board_code, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
             _context.prev = 1;
+            if (!(dataSource !== null && dataSource !== void 0 && dataSource.fromSettingMeta)) {
+              _context.next = 10;
+              break;
+            }
+            // 从URL查询字符串获取参数
+            urlParams = getFormSettingParams();
+            business_code = urlParams.businessCode;
+            channel_code = urlParams.channelCode; // 只有当isBoard参数为1时才设置boardCode
+            board_code = urlParams.isBoard && business_code && channel_code ? "".concat(business_code, "+").concat(channel_code) : undefined;
+            _context.next = 9;
+            return updateTenantSetting({
+              business_code: business_code,
+              channel_code: channel_code,
+              board_code: board_code,
+              data: values
+            });
+          case 9:
+            return _context.abrupt("return", _context.sent);
+          case 10:
             if (!customSubmit) {
-              _context.next = 6;
+              _context.next = 14;
               break;
             }
-            _context.next = 5;
+            _context.next = 13;
             return customSubmit(values);
-          case 5:
+          case 13:
             return _context.abrupt("return", _context.sent);
-          case 6:
+          case 14:
             if (!(renderMode === 'edit')) {
-              _context.next = 12;
+              _context.next = 20;
               break;
             }
-            _context.next = 9;
+            _context.next = 17;
             return update.runAsync(values);
-          case 9:
+          case 17:
             return _context.abrupt("return", _context.sent);
-          case 12:
+          case 20:
             if (!(renderMode === 'add')) {
-              _context.next = 18;
+              _context.next = 26;
               break;
             }
-            _context.next = 15;
+            _context.next = 23;
             return create.runAsync(values);
-          case 15:
+          case 23:
             res = _context.sent;
             form === null || form === void 0 || form.resetFields();
             return _context.abrupt("return", res);
-          case 18:
-            _context.prev = 18;
+          case 26:
+            _context.prev = 26;
             setLoading(false);
-            return _context.finish(18);
-          case 21:
+            return _context.finish(26);
+          case 29:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 18, 21]]);
+      }, _callee, null, [[1,, 26, 29]]);
     }));
     return function onSubmit(_x) {
       return _ref.apply(this, arguments);
@@ -130,7 +153,7 @@ var SubmitButton = function SubmitButton(props) {
   // 验证表单并提交
   var handleValideFieldsSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
-      var allValues, filteredValues, formattedValues, result, afterSubmitFunc;
+      var allValues, filteredValues, formattedValues, canSubmit, result, afterSubmitFunc;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -149,10 +172,24 @@ var SubmitButton = function SubmitButton(props) {
               });
             }
             filteredValues = filterSystemFields(allValues); // 格式化提交数据
-            formattedValues = formatSubmitValues ? formatSubmitValues(filteredValues) : filteredValues;
-            _context2.next = 10;
+            formattedValues = formatSubmitValues ? formatSubmitValues(filteredValues) : filteredValues; // 提交前校验
+            if (!beforeSubmit) {
+              _context2.next = 14;
+              break;
+            }
+            _context2.next = 11;
+            return beforeSubmit(formattedValues);
+          case 11:
+            canSubmit = _context2.sent;
+            if (canSubmit) {
+              _context2.next = 14;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 14:
+            _context2.next = 16;
             return onSubmit(formattedValues);
-          case 10:
+          case 16:
             result = _context2.sent;
             // 数据源提交成功
             if (onDataSourceFinish) {
@@ -173,19 +210,20 @@ var SubmitButton = function SubmitButton(props) {
               }
             }
             setFormFieldsUntouched(form);
-            _context2.next = 21;
+            _context2.next = 28;
             break;
-          case 18:
-            _context2.prev = 18;
+          case 24:
+            _context2.prev = 24;
             _context2.t0 = _context2["catch"](0);
+            debugger;
             PisellToast({
               content: "".concat(_context2.t0.message)
             });
-          case 21:
+          case 28:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 18]]);
+      }, _callee2, null, [[0, 24]]);
     }));
     return function handleValideFieldsSubmit(_x2) {
       return _ref2.apply(this, arguments);

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

@@ -0,0 +1,76 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+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); }); }; }
+/**
+ * URL参数处理工具方法
+ */
+
+import { request } from "../../table/utils";
+
+/**
+ * 从浏览器URL获取查询参数
+ * @returns Record<string, string> URL查询参数对象
+ */
+export var getUrlParams = function getUrlParams() {
+  var urlSearchParams = new URLSearchParams(window.location.search);
+  var urlParams = {};
+  urlSearchParams.forEach(function (value, key) {
+    urlParams[key] = value;
+  });
+  return urlParams;
+};
+
+/**
+ * 从URL参数中提取formSettingMeta相关的参数
+ * @param urlParams URL查询参数对象，如果不传则自动从浏览器获取
+ * @returns 包含business_code、channel_code和isBoard参数的对象
+ */
+export var getFormSettingParams = function getFormSettingParams(urlParams) {
+  var params = urlParams || getUrlParams();
+  return {
+    businessCode: params.businessCode || params.business_code,
+    channelCode: params.channelCode || params.channel_code,
+    isBoard: params.is_board === '1'
+  };
+};
+
+/**
+ * 根据URL参数更新租户设置数据
+ * @param data 要更新的数据对象，如 {"order.prefix":"","order.suffix":"","payment.number":""}
+ * @returns Promise<any> 返回更新结果
+ */
+export var updateTenantSettingFromUrl = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+    var urlParams, businessCode, channelCode, boardCode, requestBody, url;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          // 从URL获取参数
+          debugger;
+          urlParams = getFormSettingParams();
+          businessCode = urlParams.businessCode;
+          channelCode = urlParams.channelCode;
+          boardCode = urlParams.isBoard && businessCode && channelCode ? "".concat(businessCode, "+").concat(channelCode) : undefined; // 构建请求体，按照 curl 请求的格式
+          requestBody = {
+            business_code: businessCode || '',
+            channel_code: channelCode || '',
+            board_code: boardCode || '',
+            data: data
+          };
+          url = '/tenant/setting';
+          return _context.abrupt("return", request.getRequest().post(url, requestBody, {
+            headers: {
+              'Content-Type': 'application/json'
+            }
+          }));
+        case 8:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function updateTenantSettingFromUrl(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();

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

@@ -138,11 +138,10 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
     var renderComponent = useMemo(function () {
       var _overlayProps$innerPr;
       // 使用renderMode属性，避免和组件mode冲突
-      return /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, otherProps, {
+      return /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.innerProps, otherProps, {
         mode: propsMode,
-        renderMode: effectiveMode
-      }, overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.innerProps, {
-        style: _objectSpread(_objectSpread({}, innerStyle || {}), (overlayProps === null || overlayProps === void 0 || (_overlayProps$innerPr = overlayProps.innerProps) === null || _overlayProps$innerPr === void 0 ? void 0 : _overlayProps$innerPr.style) || {}),
+        renderMode: effectiveMode,
+        style: _objectSpread(_objectSpread({}, (overlayProps === null || overlayProps === void 0 || (_overlayProps$innerPr = overlayProps.innerProps) === null || _overlayProps$innerPr === void 0 ? void 0 : _overlayProps$innerPr.style) || {}), innerStyle || {}),
         fieldKey: name,
         isVerification: typeobj === null || typeobj === void 0 ? void 0 : typeobj.enabled,
         size: size

package/es/components/dataSourceComponents/dataSourceShow/dataSourceImage/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const DataSourceImage: (props: import("../utils").ParsedProps) => JSX.Element;
 export default DataSourceImage;

package/es/components/dataSourceComponents/dataSourceShow/dataSourceQRCode/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const DataSourceQRCode: (props: any) => JSX.Element;
 export default DataSourceQRCode;

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

@@ -89,6 +89,7 @@ var BaseTable = function BaseTable(props, ref) {
   }, [dataSourceKey]);
   useEffect(function () {
     if (dataSourceKeyRef.current) {
+      if (dataSource !== null && dataSource !== void 0 && dataSource.fromSettingMeta) return;
       list === null || list === void 0 || list.run(queryPageConfig);
     } else {
       list === null || list === void 0 || list.mutate([]);

package/es/components/dataSourceComponents/dataSourceTable/filter/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FilterItemProps } from '../../../filter/types';
 import { DataSourceType, Field } from '../../provider/dataSource/DataSourceContext';
 export declare const genGetField: (dataSource?: DataSourceType) => (key: string) => Field;

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 declare const useDataSourceKey: () => {
-    dataSourceKey: string | undefined;
-    dataSourceKeyRef: import("react").MutableRefObject<string | undefined>;
+    dataSourceKey: string | import("../../provider/dataSource/DataSourceContext").DataSourceType | undefined;
+    dataSourceKeyRef: import("react").MutableRefObject<string | import("../../provider/dataSource/DataSourceContext").DataSourceType | undefined>;
 };
 export default useDataSourceKey;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Drawer } from 'antd';
 import { OperationItem } from '../type';
 declare const useDrawerState: (operationContent?: {
@@ -9,7 +8,7 @@ declare const useDrawerState: (operationContent?: {
     openDrawer: (item: OperationItem) => void;
     closeDrawer: () => void;
     drawerContent: import("react").ReactNode;
-    Container: {
+    Container: typeof Drawer | {
         (props: import("../../../pisellModal").PisellModalProps): JSX.Element;
         confirm: (props: import("../../../pisellModal/components/functions").PisellModalFuncProps) => {
             destroy: () => void;
@@ -33,7 +32,7 @@ declare const useDrawerState: (operationContent?: {
             update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
         };
         Information: (props: import("../../../pisellModal/components/Information").InformationProps) => JSX.Element;
-    } | typeof Drawer;
+    };
     containerProps: {};
 };
 export default useDrawerState;