@pisell/materials 6.6.2 → 6.6.3

package/es/components/walletCard/index.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Card, QRCode } from 'antd';
+import { Button, Card, QRCode } from 'antd';
 import classNames from 'classnames';
 import React, { useMemo, useState } from 'react';
 import Barcode from 'react-barcode';
@@ -44,6 +44,9 @@ var DEFAULT_PROPS = {
   showCode: true,
   walletName: 'Level',
   isLogin: true,
+  showHolderName: true,
+  holder: null,
+  onSetHolder: function onSetHolder() {},
   items: [{
     type: 'rechargeable',
     display: 1,
@@ -166,7 +169,9 @@ var CardHeader = function CardHeader(_ref2) {
     isLogin = _ref2$isLogin === void 0 ? false : _ref2$isLogin,
     _ref2$showViewPin = _ref2.showViewPin,
     showViewPin = _ref2$showViewPin === void 0 ? false : _ref2$showViewPin,
-    onViewPinClick = _ref2.onViewPinClick;
+    onViewPinClick = _ref2.onViewPinClick,
+    showHolderName = _ref2.showHolderName,
+    holderName = _ref2.holderName;
   // 处理可能为0/1的布尔值
   var processedShowIcon = toBooleanValue(showIcon);
   var processedShowWalletName = toBooleanValue(showWalletName);
@@ -191,7 +196,9 @@ var CardHeader = function CardHeader(_ref2) {
     }
   })) : null, processedShowWalletName && walletName && /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-header-level-text"
-  }, walletName)), processedShowShopName && shopName && /*#__PURE__*/React.createElement("div", null, shopName), processedShowCardNo && cardNo && /*#__PURE__*/React.createElement("div", null, cardNo), processedShowViewPin && /*#__PURE__*/React.createElement("div", {
+  }, walletName)), showHolderName && /*#__PURE__*/React.createElement("div", {
+    className: classNames('pisell-wallet-card-header-holder-name')
+  }, holderName), processedShowShopName && shopName && /*#__PURE__*/React.createElement("div", null, shopName), processedShowCardNo && cardNo && /*#__PURE__*/React.createElement("div", null, cardNo), processedShowViewPin && /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-header-view-pin",
     onClick: onViewPinClick
   }, getText('walletCard-viewPin'), /*#__PURE__*/React.createElement(EyeOff, {
@@ -349,7 +356,10 @@ var WalletCard = function WalletCard(props) {
     onClick = mergedProps.onClick,
     className = mergedProps.className,
     style = mergedProps.style,
-    isGuide = mergedProps.isGuide;
+    isGuide = mergedProps.isGuide,
+    showHolderName = mergedProps.showHolderName,
+    holder = mergedProps.holder,
+    onSetHolder = mergedProps.onSetHolder;
 
   // 处理可能为0/1的布尔值props
   var showIcon = toBooleanValue(mergedProps.showIcon);
@@ -393,11 +403,13 @@ var WalletCard = function WalletCard(props) {
     if (!(items !== null && items !== void 0 && items.length)) {
       return;
     }
+    var data = {
+      id: props.id,
+      holder_id: holder === null || holder === void 0 ? void 0 : holder.holder_id
+    };
     utils === null || utils === void 0 || utils.action({
       type: 'pisell1.goWallet',
-      data: {
-        id: props.id
-      },
+      data: data,
       callback: function callback() {}
     });
   };
@@ -413,6 +425,40 @@ var WalletCard = function WalletCard(props) {
       console.error('onViewPinClick方法需要传入');
     }
   };
+  var _renderMask = function _renderMask() {
+    if (typeof onSetHolder !== 'function') return null;
+    if ((holder === null || holder === void 0 ? void 0 : holder.holder_type) === 'form' && !(holder !== null && holder !== void 0 && holder.holder_id)) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "pisell-wallet-add-holder-mask"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "pisell-wallet-add-holder-mask-text"
+      }, getText('pisell2.wallet-card.add-holder-tip')), /*#__PURE__*/React.createElement(Button, {
+        type: "primary",
+        className: "pisell-wallet-add-holder-mask-button"
+        //@ts-ignore
+        ,
+        onClick: function onClick() {
+          return onSetHolder === null || onSetHolder === void 0 ? void 0 : onSetHolder();
+        }
+      }, getText('pisell2.wallet-card.add-holder-button-text'), /*#__PURE__*/React.createElement(Iconfont, {
+        type: "pisell2-user-edit",
+        style: {
+          fontSize: 16
+        }
+      })));
+    }
+    return null;
+  };
+  var _showHolderName = useMemo(function () {
+    return (holder === null || holder === void 0 ? void 0 : holder.holder_type) === 'form' && showHolderName;
+  }, [holder, showHolderName]);
+  var holderName = useMemo(function () {
+    var _holder$detail;
+    if ((holder === null || holder === void 0 ? void 0 : holder.holder_type) === 'form' && !(holder !== null && holder !== void 0 && holder.holder_id)) {
+      return '--';
+    }
+    return (holder === null || holder === void 0 || (_holder$detail = holder.detail) === null || _holder$detail === void 0 ? void 0 : _holder$detail.main_field) || '';
+  }, [holder]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-wallet-card-wrapper', className),
     style: style,
@@ -429,7 +475,7 @@ var WalletCard = function WalletCard(props) {
     style: {
       flexDirection: codeDirection === 'top' ? 'column-reverse' : 'column'
     }
-  }, /*#__PURE__*/React.createElement("div", {
+  }, _renderMask(), /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-wallet-card-content', mode, (!isLogin || isGuide) && 'pisell-wallet-card-guest-content'),
     style: backgroundStyle
   }, isLogin ? !isGuide ? /*#__PURE__*/React.createElement("div", {
@@ -452,7 +498,9 @@ var WalletCard = function WalletCard(props) {
     onCodeClick: handleCodeClick,
     isLogin: isLogin,
     showViewPin: showViewPin,
-    onViewPinClick: onViewPinClick
+    onViewPinClick: onViewPinClick,
+    showHolderName: _showHolderName,
+    holderName: holderName
   }), /*#__PURE__*/React.createElement(CardContent, {
     items: items,
     symbol: symbol

package/es/components/walletCard/index.less

@@ -9,6 +9,36 @@
     width: 100%;
     display: flex;
     cursor: pointer;
+    position: relative;
+  }
+
+  .pisell-wallet-add-holder-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.6);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 16px;
+    z-index: 9;
+
+    &-text {
+      color: #fff;
+      text-align: center;
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 600;
+      line-height: 24px;
+      white-space: pre-line;
+    }
+
+    &-button {
+      font-weight: bold;
+    }
   }
 
   // 卡片内容区域
@@ -35,6 +65,12 @@
           color: #fff;
         }
       }
+
+      .pisell-wallet-card-header-holder-name {
+        color: var(--Gray-900, #101828);
+        border: 1px solid var(--Gray-100, #f2f4f7);
+        background: var(--Gray-100, #f2f4f7);
+      }
     }
 
     // 亮色主题
@@ -54,6 +90,12 @@
           color: #101828;
         }
       }
+
+      .pisell-wallet-card-header-holder-name {
+        color: #fff;
+        border: 1px solid var(--Gray-600, #475467);
+        background: var(--Gray-600, #475467);
+      }
     }
   }
 
@@ -66,6 +108,25 @@
     display: flex;
     justify-content: space-between;
     align-items: flex-start;
+    min-height: 100px;
+
+    .pisell-wallet-card-header-holder-name {
+      cursor: pointer;
+      display: inline-block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      padding: 2px 8px;
+      border-radius: 16px;
+      height: 22px;
+      min-width: 50px;
+      text-align: center;
+      font-size: 12px;
+      line-height: 16px;
+      max-width: 100%;
+      font-style: normal;
+      font-weight: 500;
+    }
 
     // 头部左侧
     .pisell-wallet-card-header-left {
@@ -78,7 +139,7 @@
         display: flex;
         align-items: center;
         gap: 10px;
-        margin-bottom: 8px;
+        margin-bottom: 4px;
 
         // 卡片名称文本
         .pisell-wallet-card-header-level-text {
@@ -157,7 +218,7 @@
 
   // 卡片内容列表
   .pisell-wallet-card-list {
-    margin-top: 30px;
+    margin-top: unset;
     height: 50px;
     box-sizing: border-box;
     display: flex;

package/es/index.d.ts

@@ -26,6 +26,7 @@ export { default as DataSourceTypography } from './components/dataSourceComponen
 export { default as DataSourceTable } from './components/dataSourceComponents/dataSourceTable';
 export { default as DataSourceWrapper } from './components/dataSourceComponents/dataSourceWrapper';
 export { default as FormItemCheckbox } from './components/dataSourceComponents/fields/Checkbox';
+export { default as FormItemSwitch } from './components/dataSourceComponents/fields/Switch';
 export { default as FormItemColorPicker } from './components/dataSourceComponents/fields/ColorPicker';
 export { default as FormItemDatePicker } from './components/dataSourceComponents/fields/DatePicker';
 export { default as FormItemInput } from './components/dataSourceComponents/fields/Input';

package/es/index.js

@@ -28,6 +28,7 @@ export { default as DataSourceTypography } from "./components/dataSourceComponen
 export { default as DataSourceTable } from "./components/dataSourceComponents/dataSourceTable";
 export { default as DataSourceWrapper } from "./components/dataSourceComponents/dataSourceWrapper";
 export { default as FormItemCheckbox } from "./components/dataSourceComponents/fields/Checkbox";
+export { default as FormItemSwitch } from "./components/dataSourceComponents/fields/Switch";
 export { default as FormItemColorPicker } from "./components/dataSourceComponents/fields/ColorPicker";
 export { default as FormItemDatePicker } from "./components/dataSourceComponents/fields/DatePicker";
 export { default as FormItemInput } from "./components/dataSourceComponents/fields/Input";

package/es/locales/en-US.d.ts

@@ -284,6 +284,8 @@ declare const _default: {
     'pisell-wallet-pass-card-status-lastPayment': string;
     'pisell-wallet-pass-card-reset': string;
     'pisell-wallet-pass-card-done': string;
+    'pisell2.wallet-card.add-holder-tip': string;
+    'pisell2.wallet-card.add-holder-button-text': string;
     'pisell-camera-no-camera-accessible': string;
     'pisell-camera-permission-denied': string;
     'pisell-camera-switch-camera': string;

package/es/locales/en-US.js

@@ -350,6 +350,8 @@ export default {
   'pisell-wallet-pass-card-status-lastPayment': 'Last Payment',
   'pisell-wallet-pass-card-reset': 'Reset',
   'pisell-wallet-pass-card-done': 'Done',
+  'pisell2.wallet-card.add-holder-tip': 'To ensure your benefits, please\r\nassign a holder to activate this card.',
+  'pisell2.wallet-card.add-holder-button-text': 'Set Holder',
   // 相机组件
   'pisell-camera-no-camera-accessible': 'No camera accessible',
   'pisell-camera-permission-denied': 'Permission denied',

package/es/locales/zh-CN.d.ts

@@ -279,6 +279,8 @@ declare const _default: {
     'pisell-wallet-pass-card-status-lastPayment': string;
     'pisell-wallet-pass-card-reset': string;
     'pisell-wallet-pass-card-done': string;
+    'pisell2.wallet-card.add-holder-tip': string;
+    'pisell2.wallet-card.add-holder-button-text': string;
     'pisell-camera-no-camera-accessible': string;
     'pisell-camera-permission-denied': string;
     'pisell-camera-switch-camera': string;

package/es/locales/zh-CN.js

@@ -341,6 +341,8 @@ export default {
   'pisell-wallet-pass-card-status-lastPayment': '上次结算',
   'pisell-wallet-pass-card-reset': '清空',
   'pisell-wallet-pass-card-done': '保存',
+  'pisell2.wallet-card.add-holder-tip': '为确保您的权益，此卡\r\n需指定使用人后方可激活使用。',
+  'pisell2.wallet-card.add-holder-button-text': '添加持有人',
   // 相机组件
   'pisell-camera-no-camera-accessible': '没有找到摄像头',
   'pisell-camera-permission-denied': '没有权限使用摄像头',

package/es/locales/zh-TW.d.ts

@@ -279,6 +279,8 @@ declare const _default: {
     'pisell-wallet-pass-card-status-lastPayment': string;
     'pisell-wallet-pass-card-reset': string;
     'pisell-wallet-pass-card-done': string;
+    'pisell2.wallet-card.add-holder-tip': string;
+    'pisell2.wallet-card.add-holder-button-text': string;
     'pisell-camera-no-camera-accessible': string;
     'pisell-camera-permission-denied': string;
     'pisell-camera-switch-camera': string;

package/es/locales/zh-TW.js

@@ -342,6 +342,8 @@ export default {
   'pisell-wallet-pass-card-status-lastPayment': '上次結算',
   'pisell-wallet-pass-card-reset': '清空',
   'pisell-wallet-pass-card-done': '保存',
+  'pisell2.wallet-card.add-holder-tip': '為確保您的權益，此卡\r\n需指定使用人後方可激活使用。',
+  'pisell2.wallet-card.add-holder-button-text': '添加使用人',
   // 相机组件
   'pisell-camera-no-camera-accessible': '沒有找到攝像頭',
   'pisell-camera-permission-denied': '沒有權限使用攝像頭',

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

@@ -43,7 +43,10 @@ var import_form = __toESM(require("../../form"));
 var import_FormSettingProvider = __toESM(require("./provider/formSetting/FormSettingProvider"));
 var import_page_header = __toESM(require("../../page-header"));
 var import_utils = require("./utils");
+var import_serve = require("./serve");
+var import_urlUtils = require("./urlUtils");
 var import_index = require("./index.less");
+var import_utils2 = require("@pisell/utils");
 var BaseForm = (0, import_react.forwardRef)(
   (props, ref) => {
     var _a;
@@ -63,6 +66,7 @@ var BaseForm = (0, import_react.forwardRef)(
       formatSubmitValues,
       formatInitialValues,
       customSubmit,
+      beforeSubmit,
       leaveConfirmConfig,
       ...others
     } = props;
@@ -83,11 +87,44 @@ var BaseForm = (0, import_react.forwardRef)(
     }, []);
     (0, import_react.useImperativeHandle)(ref, () => formRef.current);
     (0, import_react.useEffect)(() => {
+      var _a2;
       if (["edit", "view"].includes(renderMode || "") && dataSource) {
+        if (dataSource == null ? void 0 : dataSource.fromSettingMeta) {
+          if (props.__designMode === "design") return;
+          const { businessCode, channelCode, isBoard } = (0, import_urlUtils.getFormSettingParams)();
+          const sectionCodes = Array.from(new Set((_a2 = dataSource == null ? void 0 : dataSource.fields) == null ? void 0 : _a2.map((field) => field.name.split(".").shift())));
+          (0, import_serve.getFormSettingMetaData)({ sectionCodes, businessCode, channelCode, isBoard }).then((res) => {
+            var _a3, _b;
+            const formattedValues = formatInitialValues ? formatInitialValues(res.data) : res.data || {};
+            const fieldNames = new Set(((_a3 = dataSource == null ? void 0 : dataSource.fields) == null ? void 0 : _a3.map((field) => field.name)) || []);
+            const filteredValues = Object.keys(formattedValues).reduce((acc, key) => {
+              if (fieldNames.has(key)) {
+                acc[key] = formattedValues[key];
+              }
+              return acc;
+            }, {});
+            (_b = formRef.current) == null ? void 0 : _b.setFields((0, import_utils.transformFormObjToArrayWithUntouched)({
+              ...filteredValues
+            }));
+          }).catch((error) => {
+            console.error("获取formSettingMeta数据失败:", error);
+          });
+          return;
+        }
         get == null ? void 0 : get.runAsync().then((res) => {
-          var _a2;
+          var _a3, _b;
           const formattedValues = formatInitialValues ? formatInitialValues(res) : res;
-          (_a2 = formRef.current) == null ? void 0 : _a2.setFields((0, import_utils.transformFormObjToArrayWithUntouched)(formattedValues));
+          let values = formattedValues;
+          if ((0, import_utils2.isArr)(dataSource == null ? void 0 : dataSource.fields)) {
+            const fieldNames = new Set(((_a3 = dataSource == null ? void 0 : dataSource.fields) == null ? void 0 : _a3.map((field) => field.name)) || []);
+            values = Object.keys(formattedValues).reduce((acc, key) => {
+              if (fieldNames.has(key)) {
+                acc[key] = formattedValues[key];
+              }
+              return acc;
+            }, {});
+          }
+          (_b = formRef.current) == null ? void 0 : _b.setFields((0, import_utils.transformFormObjToArrayWithUntouched)(values));
         });
       }
     }, [renderMode, dataSource]);
@@ -164,7 +201,8 @@ var BaseForm = (0, import_react.forwardRef)(
         onDataSourceFinish,
         formatSubmitValues,
         formatInitialValues,
-        customSubmit
+        customSubmit,
+        beforeSubmit
       },
       /* @__PURE__ */ import_react.default.createElement(
         import_form.default,

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

@@ -44,7 +44,8 @@ var FormSettingProvider = (props) => {
     onDataSourceFinish,
     formatSubmitValues,
     formatInitialValues,
-    customSubmit
+    customSubmit,
+    beforeSubmit
   } = props;
   const value = import_react.default.useMemo(() => {
     return {
@@ -55,9 +56,10 @@ var FormSettingProvider = (props) => {
       onDataSourceFinish,
       formatSubmitValues,
       formatInitialValues,
-      customSubmit
+      customSubmit,
+      beforeSubmit
     };
-  }, [renderMode, groupInfoPosition, currentValue, size]);
+  }, [renderMode, groupInfoPosition, currentValue, size, beforeSubmit]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_FormSettingContext.default.Provider,
     {

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

@@ -22,12 +22,14 @@ __export(serve_exports, {
   createNocobaseData: () => createNocobaseData,
   customApi: () => customApi,
   deleteNocobaseData: () => deleteNocobaseData,
+  getFormSettingMetaData: () => getFormSettingMetaData,
   getNocobaseData: () => getNocobaseData,
   getNocobaseDataList: () => getNocobaseDataList,
   getNocobaseDataSource: () => getNocobaseDataSource,
   getNocobaseDataSourceOptions: () => getNocobaseDataSourceOptions,
   getNocobaseMainDataSource: () => getNocobaseMainDataSource,
-  updateNocobaseData: () => updateNocobaseData
+  updateNocobaseData: () => updateNocobaseData,
+  updateTenantSetting: () => updateTenantSetting
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../table/utils");
@@ -137,15 +139,56 @@ var deleteNocobaseData = async (key, id, headers) => {
     }
   );
 };
+var getFormSettingMetaData = async (params) => {
+  console.log("getFormSettingMetaData", params);
+  const { sectionCodes, businessCode, channelCode, isBoard } = params;
+  const queryParams = new URLSearchParams();
+  sectionCodes.forEach((code) => {
+    queryParams.append("section_code[]", code);
+  });
+  if (businessCode) {
+    queryParams.append("business_code", businessCode);
+  }
+  if (channelCode) {
+    queryParams.append("channel_code", channelCode);
+  }
+  if (isBoard && businessCode && channelCode) {
+    queryParams.append("board_code", `${businessCode}+${channelCode}`);
+  }
+  const url = `/tenant/setting?${queryParams.toString()}`;
+  return import_utils.request.getRequest().get(url, {}, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+};
+var updateTenantSetting = async (params) => {
+  console.log("updateTenantSetting", params);
+  const { business_code, channel_code, board_code, data } = params;
+  const requestBody = {
+    business_code,
+    channel_code,
+    board_code,
+    data
+  };
+  const url = "/tenant/setting";
+  return import_utils.request.getRequest().post(url, requestBody, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createNocobaseData,
   customApi,
   deleteNocobaseData,
+  getFormSettingMetaData,
   getNocobaseData,
   getNocobaseDataList,
   getNocobaseDataSource,
   getNocobaseDataSourceOptions,
   getNocobaseMainDataSource,
-  updateNocobaseData
+  updateNocobaseData,
+  updateTenantSetting
 });

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

@@ -41,7 +41,9 @@ var import_useFormSetting = __toESM(require("../provider/hooks/useFormSetting"))
 var import_useCtxActions = __toESM(require("../../hooks/useCtxActions"));
 var import_useDataSource = __toESM(require("../../hooks/useDataSource"));
 var import_utils = require("../utils");
+var import_urlUtils = require("../urlUtils");
 var import_index = require("./index.less");
+var import_serve = require("../serve");
 var SubmitButton = (props) => {
   const {
     children,
@@ -58,13 +60,25 @@ var SubmitButton = (props) => {
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [api, contextHolder] = import_antd.notification.useNotification();
   const form = import_antd.Form.useFormInstance();
-  const { renderMode, onDataSourceFinish, formatSubmitValues, customSubmit } = (0, import_useFormSetting.default)();
+  const { renderMode, onDataSourceFinish, formatSubmitValues, customSubmit, beforeSubmit } = (0, import_useFormSetting.default)();
   const { setVisible, refreshTableData } = (0, import_useCtxActions.default)();
-  const { create, update } = (0, import_useDataSource.default)();
+  const { create, update, dataSource } = (0, import_useDataSource.default)();
   const isDisabled = status === "disabled";
   const onSubmit = async (values) => {
     setLoading(true);
     try {
+      if (dataSource == null ? void 0 : dataSource.fromSettingMeta) {
+        const urlParams = (0, import_urlUtils.getFormSettingParams)();
+        const business_code = urlParams.businessCode;
+        const channel_code = urlParams.channelCode;
+        const board_code = urlParams.isBoard && business_code && channel_code ? `${business_code}+${channel_code}` : void 0;
+        return await (0, import_serve.updateTenantSetting)({
+          business_code,
+          channel_code,
+          board_code,
+          data: values
+        });
+      }
       if (customSubmit) {
         return await customSubmit(values);
       }
@@ -118,6 +132,12 @@ var SubmitButton = (props) => {
       }
       const filteredValues = (0, import_utils.filterSystemFields)(allValues);
       const formattedValues = formatSubmitValues ? formatSubmitValues(filteredValues) : filteredValues;
+      if (beforeSubmit) {
+        const canSubmit = await beforeSubmit(formattedValues);
+        if (!canSubmit) {
+          return;
+        }
+      }
       const result = await onSubmit(formattedValues);
       if (onDataSourceFinish) {
         onDataSourceFinish(formattedValues, result, form);
@@ -138,6 +158,7 @@ var SubmitButton = (props) => {
       }
       (0, import_utils.setFormFieldsUntouched)(form);
     } catch (error) {
+      debugger;
       (0, import_pisellToast.default)({
         content: `${error.message}`
       });

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

@@ -0,0 +1,68 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/dataSourceComponents/dataSourceForm/urlUtils.ts
+var urlUtils_exports = {};
+__export(urlUtils_exports, {
+  getFormSettingParams: () => getFormSettingParams,
+  getUrlParams: () => getUrlParams,
+  updateTenantSettingFromUrl: () => updateTenantSettingFromUrl
+});
+module.exports = __toCommonJS(urlUtils_exports);
+var import_utils = require("../../table/utils");
+var getUrlParams = () => {
+  const urlSearchParams = new URLSearchParams(window.location.search);
+  const urlParams = {};
+  urlSearchParams.forEach((value, key) => {
+    urlParams[key] = value;
+  });
+  return urlParams;
+};
+var getFormSettingParams = (urlParams) => {
+  const params = urlParams || getUrlParams();
+  return {
+    businessCode: params.businessCode || params.business_code,
+    channelCode: params.channelCode || params.channel_code,
+    isBoard: params.is_board === "1"
+  };
+};
+var updateTenantSettingFromUrl = async (data) => {
+  debugger;
+  const urlParams = getFormSettingParams();
+  const businessCode = urlParams.businessCode;
+  const channelCode = urlParams.channelCode;
+  const boardCode = urlParams.isBoard && businessCode && channelCode ? `${businessCode}+${channelCode}` : void 0;
+  const requestBody = {
+    business_code: businessCode || "",
+    channel_code: channelCode || "",
+    board_code: boardCode || "",
+    data
+  };
+  const url = "/tenant/setting";
+  return import_utils.request.getRequest().post(url, requestBody, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getFormSettingParams,
+  getUrlParams,
+  updateTenantSettingFromUrl
+});

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

@@ -136,13 +136,13 @@ var withFormItem = (WrappedComponent, overlayProps) => {
       return /* @__PURE__ */ import_react.default.createElement(
         WrappedComponent,
         {
+          ...overlayProps == null ? void 0 : overlayProps.innerProps,
           ...otherProps,
           mode: propsMode,
           renderMode: effectiveMode,
-          ...overlayProps == null ? void 0 : overlayProps.innerProps,
           style: {
-            ...innerStyle || {},
-            ...((_a2 = overlayProps == null ? void 0 : overlayProps.innerProps) == null ? void 0 : _a2.style) || {}
+            ...((_a2 = overlayProps == null ? void 0 : overlayProps.innerProps) == null ? void 0 : _a2.style) || {},
+            ...innerStyle || {}
           },
           fieldKey: name,
           isVerification: typeobj == null ? void 0 : typeobj.enabled,

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

@@ -105,6 +105,7 @@ var BaseTable = (props, ref) => {
   }, [dataSourceKey]);
   (0, import_react.useEffect)(() => {
     if (dataSourceKeyRef.current) {
+      if (dataSource == null ? void 0 : dataSource.fromSettingMeta) return;
       list == null ? void 0 : list.run(queryPageConfig);
     } else {
       list == null ? void 0 : list.mutate([]);