@pisell/private-materials 3.4.84 → 3.4.86

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/List/index.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(List_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
+var import_ahooks = require("ahooks");
 var import_materials = require("@pisell/materials");
 var import_classnames = __toESM(require("classnames"));
 var import_model = require("../../../model");
@@ -63,6 +64,7 @@ var MWCreditCardList = (props, ref) => {
     setOrder(_order);
     setOpen(true);
     setManage(false);
+    setOkLoading(false);
     setCurrentCard(0);
     _getCreditCardList();
   };
@@ -137,16 +139,21 @@ var MWCreditCardList = (props, ref) => {
       });
     }
   };
-  const onOk = () => {
-    var _a;
-    if (manage) {
-      setManage(false);
-      handleBatchDeleteCards();
-      return;
-    }
-    let cur = creditCardList.find((d) => d.id === currentCard);
-    (_a = props.onChange) == null ? void 0 : _a.call(props, cur);
-  };
+  const [okLoading, setOkLoading] = (0, import_react.useState)(false);
+  const { run: onOk } = (0, import_ahooks.useDebounceFn)(
+    () => {
+      var _a;
+      if (manage) {
+        setManage(false);
+        handleBatchDeleteCards();
+        return;
+      }
+      setOkLoading(true);
+      let cur = creditCardList.find((d) => d.id === currentCard);
+      (_a = props.onChange) == null ? void 0 : _a.call(props, cur);
+    },
+    { wait: 300 }
+  );
   const renderList = (0, import_react.useMemo)(() => {
     return creditCardList.filter((d) => d.delete !== 1);
   }, [creditCardList]);
@@ -178,7 +185,8 @@ var MWCreditCardList = (props, ref) => {
       okText: manage ? import_utils.locales.getText("tocPay.text.done") : okText,
       onOk,
       okButtonProps: {
-        disabled: !currentCard
+        disabled: !currentCard,
+        loading: okLoading
       },
       bodyStyle: { padding: 24 }
     },

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -263,35 +263,34 @@ var createThreeDSMethodIframe = async (threeDSMethodData, callback) => {
   let timer = null;
   return new Promise((res, rej) => {
     var _a2;
+    const handleMessage = (event) => {
+      if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf("securesuite") !== -1) {
+        if (typeof event.data.threeDSServerTransID == "string") {
+          setHistoryLog({
+            msg: "第三步: message 返回 threeDSServerTransID",
+            time: getCurrentTime(),
+            threeDSServerTransID: event.data.threeDSServerTransID
+          });
+          if (timer) {
+            clearTimeout(timer);
+          }
+          window.removeEventListener("message", handleMessage);
+          res({
+            threeDSServerTransID: event.data.threeDSServerTransID,
+            threeDSCompInd: "Y"
+          });
+        }
+      }
+    };
     timer = setTimeout(() => {
+      window.removeEventListener("message", handleMessage);
       res(defaultReturnParams);
       log({
         msg: "第三步: 10秒超时则走N逻辑",
         data: threeDSMethodData
       });
     }, ((_a2 = threeDSMethodData == null ? void 0 : threeDSMethodData.pay_info) == null ? void 0 : _a2.tdsMethodTimeoutMS) || 1e4);
-    window.addEventListener(
-      "message",
-      (event) => {
-        if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf("securesuite") !== -1) {
-          if (typeof event.data.threeDSServerTransID == "string") {
-            setHistoryLog({
-              msg: "第三步: message 返回 threeDSServerTransID",
-              time: getCurrentTime(),
-              threeDSServerTransID: event.data.threeDSServerTransID
-            });
-            if (timer) {
-              clearTimeout(timer);
-            }
-            res({
-              threeDSServerTransID: event.data.threeDSServerTransID,
-              threeDSCompInd: "Y"
-            });
-          }
-        }
-      },
-      false
-    );
+    window.addEventListener("message", handleMessage, false);
   });
 };
 var checkTDSAuth = async (step2, step3, callback) => {

package/lib/components/shoppingCart/components/Empty/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Empty: (props: any) => import("react").JSX.Element;
 export default Empty;

package/lib/components/systemSettings/registry/components/ItemModal.js

@@ -71,7 +71,8 @@ var interfaceTypeOptions = {
   ],
   array: [
     { value: "Select", label: "多选下拉框" },
-    { value: "Input.JSON", label: "JSON编辑器" }
+    { value: "Input.JSON", label: "JSON编辑器" },
+    { value: "RecordListWrapper", label: "记录列表包装器" }
   ]
 };
 var ItemModal = ({
@@ -193,6 +194,14 @@ var ItemModal = ({
         } else {
           formData.xDataSource = { type: "default", options: [] };
         }
+        const xRecordSchema = schema["x-record-schema"];
+        if (!xRecordSchema) {
+          formData.xRecordSchema = "";
+        } else if (typeof xRecordSchema === "string") {
+          formData.xRecordSchema = xRecordSchema;
+        } else if (typeof xRecordSchema === "object") {
+          formData.xRecordSchema = JSON.stringify(xRecordSchema, null, 2);
+        }
         const xCustomUiSchema = schema["x-custom-ui-schema"];
         if (!xCustomUiSchema) {
           formData.xCustomUiSchema = "";
@@ -228,7 +237,8 @@ var ItemModal = ({
           scopes: ["string"],
           // 为key字段添加section code前缀作为默认值
           key: (section == null ? void 0 : section.code) ? `${section.code}.` : "",
-          xDataSource: { type: "default", options: [] }
+          xDataSource: { type: "default", options: [] },
+          xRecordSchema: ""
         };
         form.setFieldsValue(defaultValues);
         setSelectedFieldType("string");
@@ -241,15 +251,15 @@ var ItemModal = ({
     form.setFieldsValue({ interfaceType: void 0 });
     form.setFieldsValue({ default: void 0 });
     form.setFieldsValue({ xDataSource: { type: "default", options: [] } });
+    form.setFieldsValue({ xRecordSchema: "" });
     form.validateFields(["default"]).catch(() => {
     });
   };
   const handleInterfaceTypeChange = (value) => {
-    if (value !== "Select") {
-      form.setFieldsValue({
-        xDataSource: { type: "default", options: [] }
-      });
-    }
+    form.setFieldsValue({
+      xDataSource: { type: "default", options: [] },
+      xRecordSchema: ""
+    });
   };
   const handleScopesChange = (values) => {
     const stringValues = values.map((v) => String(v));
@@ -298,7 +308,10 @@ var ItemModal = ({
           );
         }
       }
-      if (values.interfaceType === "Select" && values.xDataSource) {
+      const needUseXDataSource = ["Select", "RecordListWrapper"].includes(
+        values.interfaceType || ""
+      );
+      if (needUseXDataSource && values.xDataSource) {
         const {
           type: type2 = "default",
           options = [],
@@ -322,9 +335,24 @@ var ItemModal = ({
         } else if (type2 === "custom") {
           schema["x-data-source"] = { type: type2 };
         }
+      } else {
+        schema["x-data-source"] = void 0;
+      }
+      const needUseXRecordSchema = values.interfaceType === "RecordListWrapper";
+      if (needUseXRecordSchema && values.xRecordSchema) {
+        try {
+          schema["x-record-schema"] = JSON.parse(values.xRecordSchema);
+        } catch (error) {
+          throw new Error(
+            `Record List Wrapper Schema格式错误: ${error instanceof Error ? error.message : "未知错误"}`
+          );
+        }
+      } else {
+        schema["x-record-schema"] = void 0;
       }
       values.schema = Object.keys(schema).length > 0 ? schema : void 0;
       delete values.xDataSource;
+      delete values.xRecordSchema;
       delete values.xCustomUiSchema;
       await onOk(values);
     } catch (error) {
@@ -338,6 +366,17 @@ var ItemModal = ({
   const title = import_utils.locales.getText(
     type === "add" ? "registry.modal.add.item" : "registry.modal.edit.item"
   );
+  const jsonValidator = (value, message) => {
+    if (!value || value.trim() === "") {
+      return Promise.resolve();
+    }
+    try {
+      JSON.parse(value);
+      return Promise.resolve();
+    } catch (error) {
+      return Promise.reject(new Error(message));
+    }
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Drawer,
     {
@@ -458,7 +497,33 @@ var ItemModal = ({
           (option) => /* @__PURE__ */ import_react.default.createElement(Option, { key: option.value, value: option.value }, option.label)
         )
       )
-    ))), _interfaceType === "Select" && /* @__PURE__ */ import_react.default.createElement(import_OptionDataSource.default, { form, treeDataSource }), /* @__PURE__ */ import_react.default.createElement(
+    ))), ["Select", "RecordListWrapper"].includes(_interfaceType || "") && /* @__PURE__ */ import_react.default.createElement(import_OptionDataSource.default, { form, treeDataSource }), _interfaceType === "RecordListWrapper" && /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Form.Item,
+      {
+        name: "xRecordSchema",
+        label: import_utils.locales.getText("registry.form.recordListWrapper.label"),
+        rules: [
+          {
+            validator: (_, value) => jsonValidator(
+              value,
+              import_utils.locales.getText(
+                "registry.message.recordListWrapper.invalid"
+              )
+            )
+          }
+        ]
+      },
+      /* @__PURE__ */ import_react.default.createElement(
+        TextArea,
+        {
+          placeholder: import_utils.locales.getText(
+            "registry.form.recordListWrapper.placeholder"
+          ),
+          rows: 6,
+          style: { fontFamily: "monospace" }
+        }
+      )
+    ), /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form.Item,
       {
         name: "scopes",
@@ -545,21 +610,10 @@ var ItemModal = ({
         label: import_utils.locales.getText("registry.form.uiSchema"),
         rules: [
           {
-            validator: (_, value) => {
-              if (!value || value.trim() === "") {
-                return Promise.resolve();
-              }
-              try {
-                JSON.parse(value);
-                return Promise.resolve();
-              } catch (error) {
-                return Promise.reject(
-                  new Error(
-                    import_utils.locales.getText("registry.message.uiSchema.invalid")
-                  )
-                );
-              }
-            }
+            validator: (_, value) => jsonValidator(
+              value,
+              import_utils.locales.getText("registry.message.uiSchema.invalid")
+            )
           }
         ]
       },

package/lib/components/systemSettings/registry/locales.d.ts

@@ -113,6 +113,9 @@ declare const _default: {
         'registry.optionDataSource.options.required-desc': string;
         'registry.optionDataSource.options.empty': string;
         'registry.optionDataSource.options.add': string;
+        'registry.form.recordListWrapper.label': string;
+        'registry.form.recordListWrapper.placeholder': string;
+        'registry.message.recordListWrapper.invalid': string;
     };
     'zh-CN': {
         'registry.title': string;
@@ -228,6 +231,9 @@ declare const _default: {
         'registry.optionDataSource.options.required-desc': string;
         'registry.optionDataSource.options.empty': string;
         'registry.optionDataSource.options.add': string;
+        'registry.form.recordListWrapper.label': string;
+        'registry.form.recordListWrapper.placeholder': string;
+        'registry.message.recordListWrapper.invalid': string;
     };
     'zh-HK': {
         'registry.title': string;
@@ -336,6 +342,9 @@ declare const _default: {
         'registry.optionDataSource.options.required-desc': string;
         'registry.optionDataSource.options.empty': string;
         'registry.optionDataSource.options.add': string;
+        'registry.form.recordListWrapper.label': string;
+        'registry.form.recordListWrapper.placeholder': string;
+        'registry.message.recordListWrapper.invalid': string;
     };
     ja: {
         'registry.title': string;

package/lib/components/systemSettings/registry/locales.js

@@ -148,7 +148,11 @@ var locales_default = {
     "registry.optionDataSource.options.drag-desc": "Drag rows to reorder.",
     "registry.optionDataSource.options.required-desc": "Each option must have a value and a label.",
     "registry.optionDataSource.options.empty": "Please add at least one option for Pre-defined data source.",
-    "registry.optionDataSource.options.add": "Add Option"
+    "registry.optionDataSource.options.add": "Add Option",
+    // 记录列表包装器JSON配置
+    "registry.form.recordListWrapper.label": "Record List Wrapper Schema",
+    "registry.form.recordListWrapper.placeholder": "Please enter record list wrapper schema in JSON format",
+    "registry.message.recordListWrapper.invalid": "Please enter valid JSON format"
   },
   "zh-CN": {
     // 页面标题
@@ -275,7 +279,11 @@ var locales_default = {
     "registry.optionDataSource.options.drag-desc": "拖拽行可调整顺序。",
     "registry.optionDataSource.options.required-desc": "每个选项必须有选项值和标签。",
     "registry.optionDataSource.options.empty": "预设类型至少需要添加一个选项。",
-    "registry.optionDataSource.options.add": "添加选项"
+    "registry.optionDataSource.options.add": "添加选项",
+    // 记录列表包装器JSON配置
+    "registry.form.recordListWrapper.label": "记录列表包装器JSON配置",
+    "registry.form.recordListWrapper.placeholder": "请输入记录列表包装器JSON配置",
+    "registry.message.recordListWrapper.invalid": "请输入有效的JSON格式"
   },
   "zh-HK": {
     // 页面标题
@@ -394,7 +402,11 @@ var locales_default = {
     "registry.optionDataSource.options.drag-desc": "拖拽行可調整順序。",
     "registry.optionDataSource.options.required-desc": "每個選項必須有選項值和標籤。",
     "registry.optionDataSource.options.empty": "預設類型至少需要添加一個選項。",
-    "registry.optionDataSource.options.add": "添加選項"
+    "registry.optionDataSource.options.add": "添加選項",
+    // 记录列表包装器JSON配置
+    "registry.form.recordListWrapper.label": "記錄列表包裝器JSON配置",
+    "registry.form.recordListWrapper.placeholder": "請輸入記錄列表包裝器JSON配置",
+    "registry.message.recordListWrapper.invalid": "請輸入有效的JSON格式"
   },
   ja: {
     "registry.title": "設定レジストリ",

package/lib/components/systemSettings/registry/types.d.ts

@@ -112,6 +112,7 @@ export interface ItemFormData {
         extraParams?: string;
     };
     xCustomUiSchema?: string;
+    xRecordSchema?: string;
 }
 export interface GroupModalProps {
     open: boolean;

package/lib/plus/pisellSalesManagement/config/booking.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const getBookingStatusMap: () => Record<string, string>;
 export declare const BOOKING_STATUS_COLOR_MAP: Record<string, string>;
 export declare const getBookingPlatformMap: () => Record<string, string>;

package/lib/plus/selectHolder/components/ErrorTip/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ErrorTip: ({ text }: any) => import("react").JSX.Element;
 export default ErrorTip;

package/lowcode/eco-cup-list/meta.ts

@@ -9,7 +9,7 @@ const EcoCupListMeta: ComponentMetadata = {
   "devMode": "proCode",
   "npm": {
     "package": "@pisell/private-materials",
-    "version": "3.4.83",
+    "version": "1.1.2073",
     "exportName": "EcoCupList",
     "main": "src/index.ts",
     "destructuring": true,

package/lowcode/eco-customer-list/meta.ts

@@ -9,7 +9,7 @@ const EcoCustomerListMeta: ComponentMetadata = {
   "devMode": "proCode",
   "npm": {
     "package": "@pisell/private-materials",
-    "version": "3.4.83",
+    "version": "1.1.2073",
     "exportName": "EcoCustomerList",
     "main": "src/index.ts",
     "destructuring": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.4.84",
+  "version": "3.4.86",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -76,10 +76,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/utils": "3.0.2",
-    "@pisell/materials": "3.3.87",
+    "@pisell/date-picker": "3.0.4",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.4"
+    "@pisell/materials": "3.3.88",
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",