@pisell/materials 1.0.1000 → 1.0.1002

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

@@ -14,8 +14,10 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 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); }); }; }
 import { request } from "../../table/utils";
-/**
- * 获取nocobase自定义数据源
+import { getText } from "../../../locales";
+import PisellToast from "../../pisellToast";
+/**
+ * 获取nocobase自定义数据源
  */
 export var getNocobaseDataSource = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -36,8 +38,8 @@ export var getNocobaseDataSource = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 获取nocobase主数据源
+/**
+ * 获取nocobase主数据源
  */
 export var getNocobaseMainDataSource = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -58,8 +60,8 @@ export var getNocobaseMainDataSource = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 获取nocobase数据源设置
+/**
+ * 获取nocobase数据源设置
  */
 export var getNocobaseDataSourceOptions = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
@@ -80,8 +82,8 @@ export var getNocobaseDataSourceOptions = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 创建nocobase数据
+/**
+ * 创建nocobase数据
  */
 export var createNocobaseData = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
@@ -114,8 +116,8 @@ var formatQueryObjString = function formatQueryObjString() {
   }).join('&');
 };
 
-/**
- * nocobase get数据
+/**
+ * nocobase get数据
  */
 export var getNocobaseData = /*#__PURE__*/function () {
   var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
@@ -165,8 +167,8 @@ var formatRequestUrl = function formatRequestUrl(url, baseUrl, queryString) {
   return queryString ? "".concat(baseRequestUrl).concat(baseRequestUrl.includes('?') ? '&' : '?').concat(queryString) : baseRequestUrl;
 };
 
-/**
- * 自定义api接口
+/**
+ * 自定义api接口
  */
 export var customApi = /*#__PURE__*/function () {
   var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(url, data, options) {
@@ -195,8 +197,8 @@ export var customApi = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 更新nocobase数据
+/**
+ * 更新nocobase数据
  */
 export var updateNocobaseData = /*#__PURE__*/function () {
   var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
@@ -220,8 +222,8 @@ export var updateNocobaseData = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 获取nocobase数据列表
+/**
+ * 获取nocobase数据列表
  */
 export var getNocobaseDataList = /*#__PURE__*/function () {
   var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(allParams) {
@@ -246,8 +248,8 @@ export var getNocobaseDataList = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 删除nocobase数据
+/**
+ * 删除nocobase数据
  */
 export var deleteNocobaseData = /*#__PURE__*/function () {
   var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(key, id, headers) {
@@ -269,49 +271,44 @@ export var deleteNocobaseData = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 获取formSettingMeta数据
- * @param params 请求参数
- * @param params.sectionCodes 配置段代码数组，如 ['payment']
- * @param params.businessCode 业务代码
- * @param params.channelCode 渠道代码
- * @param params.isBoard 是否包含board_code参数
- * @returns Promise<any> 返回设置元数据
+/**
+ * 获取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;
+    var sectionCodes, scope, target, url, payload;
     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));
+          sectionCodes = params.sectionCodes, scope = params.scope, target = params.target;
+          url = "/tenant/setting";
+          if (scope) {
+            _context10.next = 6;
+            break;
           }
-          url = "/tenant/setting?".concat(queryParams.toString());
-          return _context10.abrupt("return", request.getRequest().get(url, {}, {
+          PisellToast({
+            content: getText('pisell-data-source-form-scope-message')
+          });
+          return _context10.abrupt("return", {});
+        case 6:
+          payload = {
+            scope: scope,
+            section_code: sectionCodes,
+            target: target
+          };
+          return _context10.abrupt("return", request.getRequest().post(url, payload, {
             headers: {
               'Content-Type': 'application/json'
             }
           }));
-        case 9:
+        case 8:
         case "end":
           return _context10.stop();
       }
@@ -322,36 +319,44 @@ export var getFormSettingMetaData = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 更新租户设置数据
- * @param params 请求参数
- * @param params.businessCode 业务代码
- * @param params.channelCode 渠道代码
- * @param params.boardCode 板块代码
- * @param params.data 要更新的数据对象，如 {"order.prefix":"","order.suffix":"","payment.number":""}
- * @returns Promise<any> 返回更新结果
+/**
+ * 更新租户设置数据
+ * @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;
+    var scope, target, 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 请求的格式
+          scope = params.scope, target = params.target, data = params.data; // 构建请求体，按照 curl 请求的格式
           requestBody = {
-            business_code: business_code,
-            channel_code: channel_code,
-            board_code: board_code,
+            scope: scope,
+            target: target,
             data: data
           };
+          if (scope) {
+            _context11.next = 6;
+            break;
+          }
+          PisellToast({
+            content: getText('pisell-data-source-form-scope-message')
+          });
+          return _context11.abrupt("return", {});
+        case 6:
           url = '/tenant/setting';
-          return _context11.abrupt("return", request.getRequest().post(url, requestBody, {
+          return _context11.abrupt("return", request.getRequest().put(url, requestBody, {
             headers: {
               'Content-Type': 'application/json'
             }
           }));
-        case 5:
+        case 8:
         case "end":
           return _context11.stop();
       }

package/es/components/dataSourceComponents/dataSourceForm/style.less

@@ -1,23 +1,23 @@
-.pisell-lowcode-form-vertical {
-  .pisell-data-source-form-item .pisell-lowcode-form-item-label > label {
-    height: auto;
-  }
-}
-
-.pisell-form-read-pretty {
-  &-value {
-    color: var(--Gray-900, #101828);
-    font-size: 16px;
-    font-weight: 600;
-    line-height: 24px; /* 150% */
-  }
-}
-
-.pisell-data-source-form-item-view {
-  .pisell-lowcode-form-item-label > label {
-    font-weight: 400;
-  }
-  .pisell-lowcode-form-item-control-input {
-    min-height: auto;
-  }
+.pisell-lowcode-form-vertical {
+  .pisell-data-source-form-item .pisell-lowcode-form-item-label > label {
+    height: auto;
+  }
+}
+
+.pisell-form-read-pretty {
+  &-value {
+    color: var(--Gray-900, #101828);
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 24px; /* 150% */
+  }
+}
+
+.pisell-data-source-form-item-view {
+  .pisell-lowcode-form-item-label > label {
+    font-weight: 400;
+  }
+  .pisell-lowcode-form-item-control-input {
+    min-height: auto;
+  }
 }

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

@@ -1,39 +1,39 @@
-import React from 'react';
-import { ButtonProps } from 'antd';
-import './index.less';
-export interface SubmitButtonProps extends ButtonProps {
-    status: 'normal' | 'disabled' | 'hidden';
-    children: React.ReactNode;
-    childrenString?: string;
-    confirmConfig?: {
-        enable: boolean;
-        title: string;
-        content: string;
-        icon: React.ReactNode;
-        okText: string;
-        cancelText: string;
-    };
-    toastConfig?: {
-        enable: boolean;
-        icon: React.ReactNode;
-        title: string;
-        showAfterSubmit?: boolean;
-    };
-    refreshData?: boolean;
-    afterSubmitType?: 'none' | 'close' | 'showModal' | 'showNotification';
-    afterSubmitModalConfig?: {
-        title: string;
-        content: string;
-        okText: string;
-        onOk?: () => void;
-    };
-    afterSubmitNotificationConfig?: {
-        title: string;
-        content: string;
-        icon: React.ReactNode;
-        duration: number;
-        placement: 'top' | 'topLeft' | 'topRight' | 'bottom' | 'bottomLeft' | 'bottomRight';
-    };
-}
-declare const SubmitButton: (props: SubmitButtonProps) => React.JSX.Element | null;
-export default SubmitButton;
+import React from 'react';
+import { ButtonProps } from 'antd';
+import './index.less';
+export interface SubmitButtonProps extends ButtonProps {
+    status: 'normal' | 'disabled' | 'hidden';
+    children: React.ReactNode;
+    childrenString?: string;
+    confirmConfig?: {
+        enable: boolean;
+        title: string;
+        content: string;
+        icon: React.ReactNode;
+        okText: string;
+        cancelText: string;
+    };
+    toastConfig?: {
+        enable: boolean;
+        icon: React.ReactNode;
+        title: string;
+        showAfterSubmit?: boolean;
+    };
+    refreshData?: boolean;
+    afterSubmitType?: 'none' | 'close' | 'showModal' | 'showNotification';
+    afterSubmitModalConfig?: {
+        title: string;
+        content: string;
+        okText: string;
+        onOk?: () => void;
+    };
+    afterSubmitNotificationConfig?: {
+        title: string;
+        content: string;
+        icon: React.ReactNode;
+        duration: number;
+        placement: 'top' | 'topLeft' | 'topRight' | 'bottom' | 'bottomLeft' | 'bottomRight';
+    };
+}
+declare const SubmitButton: (props: SubmitButtonProps) => JSX.Element | null;
+export default SubmitButton;

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

@@ -17,7 +17,7 @@ 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 useFormSettingParams from "../../hooks/useFormSettingParams";
 import "./index.less";
 import { updateTenantSetting } from "../serve";
 // 表单提交按钮
@@ -40,6 +40,9 @@ var SubmitButton = function SubmitButton(props) {
     _notification$useNoti2 = _slicedToArray(_notification$useNoti, 2),
     api = _notification$useNoti2[0],
     contextHolder = _notification$useNoti2[1];
+  var _useFormSettingParams = useFormSettingParams(),
+    scope = _useFormSettingParams.scope,
+    target = _useFormSettingParams.target;
   var form = Form.useFormInstance();
   var _useFormSetting = useFormSetting(),
     renderMode = _useFormSetting.renderMode,
@@ -57,68 +60,62 @@ var SubmitButton = function SubmitButton(props) {
   var isDisabled = status === 'disabled';
   var onSubmit = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
-      var urlParams, business_code, channel_code, board_code, res;
+      var 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;
+              _context.next = 6;
               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;
+            _context.next = 5;
             return updateTenantSetting({
-              business_code: business_code,
-              channel_code: channel_code,
-              board_code: board_code,
+              scope: scope,
+              target: target,
               data: values
             });
-          case 9:
+          case 5:
             return _context.abrupt("return", _context.sent);
-          case 10:
+          case 6:
             if (!customSubmit) {
-              _context.next = 14;
+              _context.next = 10;
               break;
             }
-            _context.next = 13;
+            _context.next = 9;
             return customSubmit(values);
-          case 13:
+          case 9:
             return _context.abrupt("return", _context.sent);
-          case 14:
+          case 10:
             if (!(renderMode === 'edit')) {
-              _context.next = 20;
+              _context.next = 16;
               break;
             }
-            _context.next = 17;
+            _context.next = 13;
             return update.runAsync(values);
-          case 17:
+          case 13:
             return _context.abrupt("return", _context.sent);
-          case 20:
+          case 16:
             if (!(renderMode === 'add')) {
-              _context.next = 26;
+              _context.next = 22;
               break;
             }
-            _context.next = 23;
+            _context.next = 19;
             return create.runAsync(values);
-          case 23:
+          case 19:
             res = _context.sent;
             form === null || form === void 0 || form.resetFields();
             return _context.abrupt("return", res);
-          case 26:
-            _context.prev = 26;
+          case 22:
+            _context.prev = 22;
             setLoading(false);
-            return _context.finish(26);
-          case 29:
+            return _context.finish(22);
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 26, 29]]);
+      }, _callee, null, [[1,, 22, 25]]);
     }));
     return function onSubmit(_x) {
       return _ref.apply(this, arguments);

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

@@ -1,4 +1,4 @@
-.pisell-lowcode-data-source-form-submit-button-wrapper {
-  display: flex;
-  justify-content: center;
-}
+.pisell-lowcode-data-source-form-submit-button-wrapper {
+  display: flex;
+  justify-content: center;
+}

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

@@ -1,32 +1,32 @@
-import React from 'react';
-import { DataSourceType } from "../provider/dataSource/DataSourceContext";
-export declare type ModeType = 'edit' | 'add' | 'view' | 'disabled' | 'hidden' | 'tableView';
-export interface DataSourceFormProps {
-    title: string;
-    description: string;
-    dataSource: DataSourceType;
-    extraParams?: Record<string, any>;
-    showTitle: boolean;
-    showDescription: boolean;
-    groupInfoPosition: 'top' | 'side';
-    variables: any[];
-    renderMode?: ModeType;
-    currentValue?: 'server' | 'local';
-    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>;
-    beforeSubmit?: (values: Record<string, any>) => Promise<boolean> | boolean;
-    leaveConfirmConfig?: {
-        enable: boolean;
-        title: string;
-        content: string;
-        icon: React.ReactNode;
-        okText: string;
-        cancelText: string;
-    };
-}
+import React from 'react';
+import { DataSourceType } from "../provider/dataSource/DataSourceContext";
+export declare type ModeType = 'edit' | 'add' | 'view' | 'disabled' | 'hidden' | 'tableView';
+export interface DataSourceFormProps {
+    title: string;
+    description: string;
+    dataSource: DataSourceType;
+    extraParams?: Record<string, any>;
+    showTitle: boolean;
+    showDescription: boolean;
+    groupInfoPosition: 'top' | 'side';
+    variables: any[];
+    renderMode?: ModeType;
+    currentValue?: 'server' | 'local';
+    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>;
+    beforeSubmit?: (values: Record<string, any>) => Promise<boolean> | boolean;
+    leaveConfirmConfig?: {
+        enable: boolean;
+        title: string;
+        content: string;
+        icon: React.ReactNode;
+        okText: string;
+        cancelText: string;
+    };
+}

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

@@ -1,24 +1,24 @@
-/**
- * URL参数处理工具方法
- */
-/**
- * 从浏览器URL获取查询参数
- * @returns Record<string, string> URL查询参数对象
- */
-export declare const getUrlParams: () => Record<string, string>;
-/**
- * 从URL参数中提取formSettingMeta相关的参数
- * @param urlParams URL查询参数对象，如果不传则自动从浏览器获取
- * @returns 包含business_code、channel_code和isBoard参数的对象
- */
-export declare const getFormSettingParams: (urlParams?: Record<string, string>) => {
-    businessCode: string;
-    channelCode: string;
-    isBoard: boolean;
-};
-/**
- * 根据URL参数更新租户设置数据
- * @param data 要更新的数据对象，如 {"order.prefix":"","order.suffix":"","payment.number":""}
- * @returns Promise<any> 返回更新结果
- */
-export declare const updateTenantSettingFromUrl: (data: Record<string, any>) => Promise<any>;
+/**
+ * URL参数处理工具方法
+ */
+/**
+ * 从浏览器URL获取查询参数
+ * @returns Record<string, string> URL查询参数对象
+ */
+export declare const getUrlParams: () => Record<string, string>;
+/**
+ * 从URL参数中提取formSettingMeta相关的参数
+ * @param urlParams URL查询参数对象，如果不传则自动从浏览器获取
+ * @returns 包含business_code、channel_code和isBoard参数的对象
+ */
+export declare const getFormSettingParams: (urlParams?: Record<string, string>) => {
+    businessCode: string;
+    channelCode: string;
+    isBoard: boolean;
+};
+/**
+ * 根据URL参数更新租户设置数据
+ * @param data 要更新的数据对象，如 {"order.prefix":"","order.suffix":"","payment.number":""}
+ * @returns Promise<any> 返回更新结果
+ */
+export declare const updateTenantSettingFromUrl: (data: Record<string, any>) => Promise<any>;