@pisell/materials 6.3.25 → 6.3.27

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/dataSourceComponents/dataSourceForm/serve.ts
@@ -33,6 +43,8 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../table/utils");
+var import_locales = require("../../../locales");
+var import_pisellToast = __toESM(require("../../pisellToast"));
 var getNocobaseDataSource = async () => {
   return import_utils.request.getRequest().post(
     "/dataSources:listEnabled?paginate=false&appends%5B%5D=collections",
@@ -103,7 +115,7 @@ var formatRequestUrl = (url, baseUrl, queryString) => {
   return queryString ? `${baseRequestUrl}${baseRequestUrl.includes("?") ? "&" : "?"}${queryString}` : baseRequestUrl;
 };
 var customApi = async (url, data, options) => {
-  const { method, baseUrl, headers = [], params = [], body = {} } = options;
+  const { method, baseUrl, headers = [], params = [], body = {}, dataSourceKey } = options;
   const requestHeaders = formatHeaders(headers);
   const queryString = formatQueryString(params);
   const requestUrl = formatRequestUrl(url, baseUrl, queryString);
@@ -111,7 +123,8 @@ var customApi = async (url, data, options) => {
   const requestMethod = methodMap[method];
   return import_utils.request.getRequest()[requestMethod](requestUrl, requestData, {
     headers: requestHeaders,
-    isCustomApi: true
+    isCustomApi: true,
+    isShopApi: dataSourceKey === "mypisell-api"
   });
 };
 var updateNocobaseData = async (params) => {
@@ -141,22 +154,20 @@ 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 { sectionCodes, scope, target } = params;
+  const url = `/tenant/setting`;
+  if (!scope) {
+    (0, import_pisellToast.default)({
+      content: (0, import_locales.getText)("pisell-data-source-form-scope-message")
+    });
+    return {};
   }
-  const url = `/tenant/setting?${queryParams.toString()}`;
-  return import_utils.request.getRequest().get(url, {}, {
+  const payload = {
+    scope,
+    section_code: sectionCodes,
+    target
+  };
+  return import_utils.request.getRequest().post(url, payload, {
     headers: {
       "Content-Type": "application/json"
     }
@@ -164,15 +175,20 @@ var getFormSettingMetaData = async (params) => {
 };
 var updateTenantSetting = async (params) => {
   console.log("updateTenantSetting", params);
-  const { business_code, channel_code, board_code, data } = params;
+  const { scope, target, data } = params;
   const requestBody = {
-    business_code,
-    channel_code,
-    board_code,
+    scope,
+    target,
     data
   };
+  if (!scope) {
+    (0, import_pisellToast.default)({
+      content: (0, import_locales.getText)("pisell-data-source-form-scope-message")
+    });
+    return {};
+  }
   const url = "/tenant/setting";
-  return import_utils.request.getRequest().post(url, requestBody, {
+  return import_utils.request.getRequest().put(url, requestBody, {
     headers: {
       "Content-Type": "application/json"
     }

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

@@ -41,7 +41,7 @@ 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_useFormSettingParams = __toESM(require("../../hooks/useFormSettingParams"));
 var import_index = require("./index.less");
 var import_serve = require("../serve");
 var SubmitButton = (props) => {
@@ -59,6 +59,7 @@ var SubmitButton = (props) => {
   } = props;
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [api, contextHolder] = import_antd.notification.useNotification();
+  const { scope, target } = (0, import_useFormSettingParams.default)();
   const form = import_antd.Form.useFormInstance();
   const { renderMode, onDataSourceFinish, formatSubmitValues, customSubmit, beforeSubmit } = (0, import_useFormSetting.default)();
   const { setVisible, refreshTableData } = (0, import_useCtxActions.default)();
@@ -68,14 +69,9 @@ var SubmitButton = (props) => {
     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,
+          scope,
+          target,
           data: values
         });
       }

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

@@ -54,7 +54,7 @@ var updateTenantSettingFromUrl = async (data) => {
     data
   };
   const url = "/tenant/setting";
-  return import_utils.request.getRequest().post(url, requestBody, {
+  return import_utils.request.getRequest().put(url, requestBody, {
     headers: {
       "Content-Type": "application/json"
     }

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

@@ -40,6 +40,7 @@ export declare const withFormItem: <P extends object>(WrappedComponent: React.Co
 } | undefined) => React.FC<P & WithFormItemProps>;
 export declare const withDataSource: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
     dataSource?: any;
+    extraParams?: Record<string, any> | undefined;
 }) => React.JSX.Element;
 export declare const withOptions: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
     options?: any;

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

@@ -480,11 +480,12 @@ var withFormItem = (WrappedComponent, overlayProps) => {
 };
 var withDataSource = (WrappedComponent) => {
   return (props) => {
-    const { dataSource } = props;
+    const { dataSource, extraParams } = props;
     return /* @__PURE__ */ import_react.default.createElement(
       import_DataSourceProvider.default,
       {
         dataSource,
+        extraParams: { list: extraParams },
         requestOptions: {
           list: {
             cacheKey: `${dataSource == null ? void 0 : dataSource.headerDataSource}-${dataSource == null ? void 0 : dataSource.name}-${dataSource == null ? void 0 : dataSource.tableName}`

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const useDrawerState: (operationContent?: {
     [key: string]: import("react").ReactNode;
 } | undefined) => any;

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

@@ -179,22 +179,40 @@ var customApiFormatFilter = (filter) => {
 var useFormat = ({ dataSourceKey, fields }) => {
   const formatListResult = (0, import_ahooks.useMemoizedFn)(
     (res) => {
-      if (dataSourceKey === "pisell2-api" && "list" in res && "page" in res) {
-        return {
-          data: res.list,
-          count: res.count,
-          page: res.page,
-          pageSize: res.size
-        };
+      if (dataSourceKey === "pisell2-api") {
+        if (Array.isArray(res)) {
+          return {
+            data: res,
+            count: res.length,
+            page: 1,
+            pageSize: res.length
+          };
+        } else if ("list" in res && "page" in res) {
+          return {
+            data: res.list,
+            count: res.count,
+            page: res.page,
+            pageSize: res.size
+          };
+        }
       }
-      if (dataSourceKey === "mypisell-api" && "list" in res && "skip" in res) {
-        const skip = typeof res.skip === "number" ? res.skip : 1;
-        return {
-          data: res.list,
-          count: res.count,
-          page: skip - 1 || 1,
-          pageSize: res.size
-        };
+      if (dataSourceKey === "mypisell-api") {
+        if (Array.isArray(res)) {
+          return {
+            data: res,
+            count: res.length,
+            page: 1,
+            pageSize: res.length
+          };
+        } else if ("list" in res && "skip" in res) {
+          const skip = typeof res.skip === "number" ? res.skip : 1;
+          return {
+            data: res.list,
+            count: res.count,
+            page: skip - 1 || 1,
+            pageSize: res.size
+          };
+        }
       }
       if ("meta" in res) {
         return {

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableQuery.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DataSourceTableProps } from '../type';
 declare type Params = {
     pagination?: {

package/lib/components/dataSourceComponents/fields/Input.Mobile/serve.d.ts

@@ -8,6 +8,8 @@ export interface Country {
         en: string;
         'zh-CN': string;
         'zh-HK': string;
+        'ja': string;
+        'pt': string;
         original: string;
     };
     code: string;

package/lib/components/dataSourceComponents/fields/Input.Phone/serve.d.ts

@@ -9,6 +9,8 @@ export interface Country {
         en: string;
         'zh-CN': string;
         'zh-HK': string;
+        'ja': string;
+        'pt': string;
         original: string;
     };
     code: string;

package/lib/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: "custom" | "xzero" | "saas";
+    rootDomain: "custom" | "saas" | "xzero";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

package/lib/components/dataSourceComponents/fields/Select/index.d.ts

@@ -7,5 +7,6 @@ declare const SelectWithDataSource: (props: import("antd").SelectProps<any, impo
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
+    extraParams?: Record<string, any> | undefined;
 }) => React.JSX.Element;
 export default SelectWithDataSource;

package/lib/components/dataSourceComponents/fields/Translation/BaseTranslation.js

@@ -41,13 +41,17 @@ var defaultValue = {
   en: "",
   "zh-CN": "",
   "zh-HK": "",
+  "ja": "",
+  "pt": "",
   original: ""
 };
 var languageConfig = [
   { key: "original", label: (0, import_locales.getText)("pisell-translation-original") },
   { key: "en", label: "English" },
   { key: "zh-CN", label: "简体中文" },
-  { key: "zh-HK", label: "繁體中文" }
+  { key: "zh-HK", label: "繁體中文" },
+  { key: "ja", label: "日本語" },
+  { key: "pt", label: "Português" }
 ];
 var Translation = ({
   value = defaultValue,
@@ -56,7 +60,8 @@ var Translation = ({
   disabled,
   type = "text",
   // 默认为普通文本输入
-  maxLength
+  maxLength,
+  inputStyle
 }) => {
   const [open, setOpen] = (0, import_react.useState)(false);
   const getInputComponent = (0, import_react.useCallback)(() => {
@@ -90,7 +95,8 @@ var Translation = ({
       value: (value == null ? void 0 : value[key]) || "",
       onChange: handleInputChange(key),
       allowClear: true,
-      maxLength
+      maxLength,
+      style: inputStyle || {}
     }
   )))));
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "translation-wrapper" }, /* @__PURE__ */ import_react.default.createElement(
@@ -101,7 +107,8 @@ var Translation = ({
       placeholder,
       disabled,
       className: "translation-input",
-      maxLength
+      maxLength,
+      style: inputStyle || {}
     }
   ), /* @__PURE__ */ import_react.default.createElement(
     import_antd.Popover,

package/lib/components/dataSourceComponents/fields/Upload/constants.d.ts

@@ -1,4 +1,4 @@
-export declare const SUPPORTED_LANGUAGES: readonly ["original", "en", "zh-CN", "zh-HK"];
+export declare const SUPPORTED_LANGUAGES: readonly ["original", "en", "zh-CN", "zh-HK", "ja", "pt"];
 export declare const DEFAULT_MAX_COUNT = 9;
 export declare const DEFAULT_UID = "-1";
 export declare const MEDIA_TYPES: {

package/lib/components/dataSourceComponents/fields/Upload/constants.js

@@ -27,7 +27,7 @@ __export(constants_exports, {
   SUPPORTED_LANGUAGES: () => SUPPORTED_LANGUAGES
 });
 module.exports = __toCommonJS(constants_exports);
-var SUPPORTED_LANGUAGES = ["original", "en", "zh-CN", "zh-HK"];
+var SUPPORTED_LANGUAGES = ["original", "en", "zh-CN", "zh-HK", "ja", "pt"];
 var DEFAULT_MAX_COUNT = 9;
 var DEFAULT_UID = "-1";
 var MEDIA_TYPES = {

package/lib/components/dataSourceComponents/fields/Upload/utils.js

@@ -171,7 +171,7 @@ var handleMultilingualSingleFile = (value, index = 1) => ({
   multilingual: createMultilingualData(value)
 });
 var handleMultilingualObject = (value, index = 1) => {
-  const defaultUrl = value.original || value.en || value["zh-CN"] || value["zh-HK"];
+  const defaultUrl = value.original || value.en || value["zh-CN"] || value["zh-HK"] || value["ja"] || value["pt"];
   return {
     uid: `-${index}`,
     name: getFileName(defaultUrl),

package/lib/components/dataSourceComponents/fields/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const formFieldMap: {
     FormItemCheckbox: import("react").FC<{}> & {
         Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -19,7 +20,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: "custom" | "xzero" | "saas";
+            rootDomain: "custom" | "saas" | "xzero";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -40,6 +41,7 @@ declare const formFieldMap: {
         extraParams?: Record<string, any> | undefined;
     } & {
         dataSource?: any;
+        extraParams?: Record<string, any> | undefined;
     }) => import("react").JSX.Element;
     FormItemInputNumber: import("react").FC<any>;
     FormItemPercent: import("react").FC<any>;
@@ -76,7 +78,7 @@ declare const getFieldComponent: (fieldComponent: string) => (import("react").FC
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: "custom" | "xzero" | "saas";
+        rootDomain: "custom" | "saas" | "xzero";
         customDomain?: string | undefined;
         value?: string | undefined;
         tenantId: string;
@@ -95,6 +97,7 @@ declare const getFieldComponent: (fieldComponent: string) => (import("react").FC
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
+    extraParams?: Record<string, any> | undefined;
 }) => import("react").JSX.Element) | import("react").FC<any> | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
     onChange: (value: string) => void;
 } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;

package/lib/components/dataSourceComponents/hooks/useActions.js

@@ -104,7 +104,8 @@ var useActions = ({
           baseUrl: baseUrlMap[dataSourceKey] || (options == null ? void 0 : options.baseUrl),
           params,
           headers,
-          body
+          body,
+          dataSourceKey
         });
         if (["pisell2-api", "mypisell-api"].includes(dataSourceKey)) {
           if ("mypisell-api" === dataSourceKey && designMode === "design") {
@@ -208,7 +209,10 @@ var useActions = ({
           return [];
         }
         const listApi = genCustomApi(actions == null ? void 0 : actions.list);
-        return formatListResult(await listApi(formatParams));
+        return formatListResult(await listApi({
+          ...formatParams,
+          ...(extraParams == null ? void 0 : extraParams.list) || {}
+        }));
       }
       if (!name) return {};
       return formatListResult(

package/lib/components/dataSourceComponents/hooks/useFormSettingParams.js

@@ -0,0 +1,63 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/dataSourceComponents/hooks/useFormSettingParams.ts
+var useFormSettingParams_exports = {};
+__export(useFormSettingParams_exports, {
+  default: () => useFormSettingParams_default
+});
+module.exports = __toCommonJS(useFormSettingParams_exports);
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
+var import_urlUtils = require("../dataSourceForm/urlUtils");
+var scopeMap = {
+  saas: "saas",
+  org: "organization",
+  biz: "business",
+  channel: "channel",
+  board: "board"
+};
+var useFormSettingParams = () => {
+  var _a, _b;
+  const context = (0, import_useEngineContext.default)();
+  const { getApp } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const app = getApp == null ? void 0 : getApp();
+  const params = (_b = app == null ? void 0 : app.history) == null ? void 0 : _b.useParams();
+  const queryParams = (0, import_urlUtils.getUrlParams)();
+  const businessCode = (queryParams == null ? void 0 : queryParams.biz) || (queryParams == null ? void 0 : queryParams.business_code);
+  const channelCode = queryParams == null ? void 0 : queryParams.channel;
+  const scope = scopeMap[params == null ? void 0 : params.scope];
+  const originTarget = businessCode && channelCode ? `${businessCode}+${channelCode}` : businessCode || channelCode;
+  const target = ["organization", "saas"].includes(scope) ? void 0 : originTarget;
+  return {
+    businessCode,
+    channelCode,
+    scope,
+    target
+  };
+};
+var useFormSettingParams_default = useFormSettingParams;

package/lib/components/drag-sort-tree/TreeItem/index.d.ts

@@ -0,0 +1,19 @@
+import React from 'react';
+import './index.less';
+import { ValueProps, SortType } from '../types';
+declare type IdType = string | number;
+declare type TreeItemProps = {
+    id: string | number;
+    key: string | number;
+    item: ValueProps | any;
+    depth: number;
+    lists: any[];
+    childrenProps?: SortType;
+    sensors?: any;
+    expandedKeys?: IdType[];
+    setExpandedKeys?: any;
+    onSelectKeys?: (ids: IdType) => void;
+    onChange?: (value: any[]) => void;
+};
+declare const TreeItem: (props: TreeItemProps) => React.JSX.Element;
+export default TreeItem;