@pisell/materials 6.3.9 → 6.3.10

package/lib/components/table/Actions/component/ExportImport/index.js

@@ -63,6 +63,7 @@ var ExportImport = ({ exportImport }) => {
   const [type, setType] = (0, import_react.useState)(import_status.defaultOptions.exportType);
   const [value, setValue] = (0, import_react.useState)("");
   const [errorStatus, setErrorStatus] = (0, import_react.useState)();
+  const [loading, setLoading] = (0, import_react.useState)(false);
   const { state } = (0, import_hooks.useSharedState)(import_model.Context);
   const { originResultDataSource, currentDataSource } = state;
   const context = (0, import_useEngineContext.default)();
@@ -142,33 +143,43 @@ var ExportImport = ({ exportImport }) => {
   });
   const onOk = async () => {
     const { apiUrl, otherParams } = exportImport;
-    if (value === import_status.defaultOptions.exportValue) {
-      const _params = {
-        type,
-        originDataSource: originResultDataSource,
-        currentDataSource
-      };
-      const result = await (0, import_function.batchExport)(_params, exportImport);
-      if (result) {
-        onCancel();
-      }
-    } else if (value === import_status.defaultOptions.importValue) {
-      const formData = new FormData();
-      formData.append("file", file);
-      const formId = otherParams == null ? void 0 : otherParams.form_id;
-      const formCode = otherParams == null ? void 0 : otherParams.code;
-      if (formId) {
-        formData.append("form_id", formId);
-      }
-      if (formCode) {
-        formData.append("code", formCode);
-      }
-      formData.append("url", (apiUrl == null ? void 0 : apiUrl.export) || "");
-      if (formData) {
-        import_antd.message.loading({ content: "Loading...", key: value });
-        _batchImport.run(formData);
+    setLoading(true);
+    try {
+      if (value === import_status.defaultOptions.exportValue) {
+        const _params = {
+          type,
+          originDataSource: originResultDataSource,
+          currentDataSource
+        };
+        const result = await (0, import_function.batchExport)(_params, exportImport);
+        if (result) {
+          onCancel();
+        }
+      } else if (value === import_status.defaultOptions.importValue) {
+        const formData = new FormData();
+        formData.append("file", file);
+        const formId = otherParams == null ? void 0 : otherParams.form_id;
+        const formCode = otherParams == null ? void 0 : otherParams.code;
+        if (formId) {
+          formData.append("form_id", formId);
+        }
+        if (formCode) {
+          formData.append("code", formCode);
+        }
+        formData.append("url", (apiUrl == null ? void 0 : apiUrl.import) || "");
+        if (otherParams.import) {
+          Object.entries(otherParams.import).forEach(([key, value2]) => {
+            formData.append(key, value2);
+          });
+        }
+        if (formData) {
+          import_antd.message.loading({ content: "Loading...", key: value });
+          await _batchImport.run(formData);
+        }
       }
+    } catch (error) {
     }
+    setLoading(false);
   };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Dropdown,
@@ -196,6 +207,7 @@ var ExportImport = ({ exportImport }) => {
       onOk,
       cancelText: (0, import_locales.getText)("table-action-export-import-cancel"),
       okButtonProps: {
+        loading,
         disabled: value === import_status.defaultOptions.importValue && (!file || !!errorStatus)
       }
     },

package/lib/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filters" | "view_mode" | "filter_setting" | "group_by" | "order_by" | "column_setting" | "gallery_setting")[];
+}) => ("view_mode" | "filter_setting" | "group_by" | "order_by" | "column_setting" | "gallery_setting" | "filters")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/lib/components/table/serve.js

@@ -35,6 +35,14 @@ var defaultUrl = {
   template: "/shop/form/data/download-template"
 };
 var formatApiParams = (params, type) => {
+  if (params instanceof FormData) {
+    let url = params.get("url");
+    params.delete("url");
+    return {
+      url: url || (defaultUrl == null ? void 0 : defaultUrl[type]),
+      params
+    };
+  }
   const _url = (params == null ? void 0 : params.url) || (defaultUrl == null ? void 0 : defaultUrl[type]);
   let _params = { ...params };
   delete _params.url;

package/lib/components/tabs/index.d.ts

@@ -6,6 +6,7 @@ declare class Tabs extends Component<any> {
         activeKey: any;
     };
     componentDidMount(): void;
+    componentDidUpdate(prevProps: Readonly<any>): void;
     private _handleChange;
     setActiveKey: (key: string) => void;
     getActiveKey: () => any;

package/lib/components/tabs/index.js

@@ -46,6 +46,11 @@ var Tabs = class extends import_react.Component {
   componentDidMount() {
     document.body.id = "body";
   }
+  componentDidUpdate(prevProps) {
+    if (prevProps.activeKey !== this.props.activeKey) {
+      this.setState({ activeKey: this.props.activeKey });
+    }
+  }
   _handleChange = (key) => {
     this.setActiveKey(key);
   };

package/lib/components/walletCard/index.d.ts

@@ -1,19 +1,19 @@
 import React from 'react';
 import './index.less';
-declare global {
-    namespace JSX {
-        interface IntrinsicElements {
-            [elemName: string]: any;
-        }
-    }
-}
 export interface WalletCardItem {
-    key: string;
-    label?: string;
-    hidden?: boolean;
+    type: string;
+    custom_title?: string | {
+        original: string;
+        en: string;
+        'zh-CN': string;
+        'zh-HK': string;
+    };
+    display?: 0 | 1;
     value?: number;
 }
 export interface WalletCardProps {
+    /** 钱包ID */
+    id?: string;
     /** 二维码弹窗适配平台 */
     platform?: 'pc' | 'h5' | 'ipad';
     /** 卡片主题 */
@@ -21,7 +21,7 @@ export interface WalletCardProps {
     /** 默认还是完整显示code */
     cardStyle?: 'normal' | 'full';
     /** 条形码还是二维码 */
-    codeType?: 'barCode' | 'orCode';
+    codeType?: 'barCode' | 'qrCode';
     /** 二维码方向 */
     codeDirection?: 'bottom' | 'top';
     /** 自定义背景图 */

package/lib/components/walletCard/index.js

@@ -53,7 +53,7 @@ var DEFAULT_PROPS = {
   showWalletName: true,
   shopName: "Store name",
   showShopName: true,
-  cardNo: "Wallet number",
+  cardNo: "WL0000000001",
   cardStyle: "normal",
   codeType: "barCode",
   platform: "pc",
@@ -64,24 +64,44 @@ var DEFAULT_PROPS = {
   isLogin: true,
   items: [
     {
-      key: "rechargeable",
-      label: "rechargeable",
-      value: 0
+      type: "rechargeable",
+      display: 1,
+      custom_title: {
+        original: "Balance",
+        "zh-CN": "充值卡",
+        "zh-HK": "充值卡",
+        en: "Balance"
+      }
     },
     {
-      key: "piont",
-      label: "piont",
-      value: 10
+      type: "point",
+      display: 1,
+      custom_title: {
+        original: "Points",
+        "zh-CN": "积分卡",
+        "zh-HK": "積分卡",
+        en: "Points"
+      }
     },
     {
-      key: "voucher",
-      label: "Discount cardvoucher",
-      value: 0
+      type: "voucher",
+      display: 1,
+      custom_title: {
+        original: "Voucher",
+        "zh-CN": "代金券",
+        "zh-HK": "代金券",
+        en: "Voucher"
+      }
     },
     {
-      key: "discount",
-      label: "discount",
-      value: 0
+      type: "discount",
+      display: 1,
+      custom_title: {
+        original: "Discount",
+        "zh-CN": "折扣卡",
+        "zh-HK": "折扣卡",
+        en: "Discount"
+      }
     }
   ]
 };
@@ -101,7 +121,7 @@ var useCodeModal = (cardNo, onCodeClick, codeType) => {
     e.stopPropagation();
     if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
       const typeMap = {
-        orCode: "qrCode",
+        qrCode: "qrCode",
         barCode: "barCode"
       };
       (_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.postMessageToApp) == null ? void 0 : _d.call(_c, {
@@ -188,8 +208,12 @@ var CardHeader = ({
   )));
 };
 var CardItem = ({ item, symbol }) => {
-  const { key, label, value } = item;
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-item-label" }, (0, import_locales.getText)(`walletCard-${label}`) || ""), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-item-value" }, key === "rechargeable" ? /* @__PURE__ */ import_react.default.createElement(
+  var _a;
+  const { type, custom_title, value } = item;
+  const context = (0, import_useEngineContext.default)();
+  const utils = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils;
+  const translationOriginal = (utils == null ? void 0 : utils.translationOriginal) || (utils == null ? void 0 : utils.translation);
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-item-label" }, translationOriginal(custom_title || "") || ""), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-item-value" }, type === "rechargeable" ? /* @__PURE__ */ import_react.default.createElement(
     import_Amount.default,
     {
       className: "pisell-card-amount-item-value",
@@ -199,27 +223,19 @@ var CardItem = ({ item, symbol }) => {
       showCurrencySymbol: true,
       value
     }
-  ) : value));
+  ) : value || "0"));
 };
 var CardContent = ({ items, symbol }) => {
-  const expectedOrder = ["piont", "balance", "discount", "voucher"];
-  const sortedItems = (0, import_react.useMemo)(() => {
-    if (!(items == null ? void 0 : items.length)) return [];
-    return [...items].sort((a, b) => {
-      const indexA = expectedOrder.indexOf(a.key);
-      const indexB = expectedOrder.indexOf(b.key);
-      return indexA - indexB;
-    });
-  }, [items]);
+  const filteredItems = (items || []).filter((item) => item.display !== 0);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "pisell-wallet-card-list",
       style: {
-        justifyContent: (sortedItems || []).length > 1 ? "space-between" : "flex-start"
+        justifyContent: filteredItems.length > 1 ? "space-between" : "flex-start"
       }
     },
-    (sortedItems || []).map((item, index) => /* @__PURE__ */ import_react.default.createElement(CardItem, { key: index, item, symbol }))
+    filteredItems.map((item, index) => /* @__PURE__ */ import_react.default.createElement(CardItem, { key: index, item, symbol }))
   );
 };
 var CodeDisplay = ({ codeType, cardNo }) => {
@@ -336,7 +352,9 @@ var WalletCard = (props) => {
     }
     utils == null ? void 0 : utils.action({
       type: "pisell1.goWallet",
-      data: {},
+      data: {
+        id: props.id
+      },
       callback: () => {
       }
     });

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

@@ -175,7 +175,7 @@ declare const _default: {
     'pisell-action-get-data': string;
     'pisell-action-delete-success': string;
     'pisell-action-delete-failed': string;
-    'walletCard-piont': string;
+    'walletCard-point': string;
     'walletCard-rechargeable': string;
     'walletCard-voucher': string;
     'walletCard-discount': string;

package/lib/locales/en-US.js

@@ -168,7 +168,7 @@ var en_US_default = {
   "pisell-adjust-price-total-after-discount": "Total after discount: ",
   "pisell-adjust-price-discount-can-be-maximum": "Discount can be maximum",
   "pisell-discount-card-title": "Discount",
-  "pisell-discount-card-unit": "off",
+  "pisell-discount-card-unit": "OFF",
   "pisell-discount-card-fixed-amount-prefix": "Save",
   // 数据源表格
   "pisell-data-source-table-add": "Add",
@@ -215,7 +215,7 @@ var en_US_default = {
   "pisell-action-get-data": "Please get data first",
   "pisell-action-delete-success": "Deleted successfully",
   "pisell-action-delete-failed": "Delete failed, please try again",
-  "walletCard-piont": "Points",
+  "walletCard-point": "Points",
   "walletCard-rechargeable": "Balance",
   "walletCard-voucher": "Voucher",
   "walletCard-discount": "Discount",

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

@@ -175,7 +175,7 @@ declare const _default: {
     'pisell-action-get-data': string;
     'pisell-action-delete-success': string;
     'pisell-action-delete-failed': string;
-    'walletCard-piont': string;
+    'walletCard-point': string;
     'walletCard-rechargeable': string;
     'walletCard-voucher': string;
     'walletCard-discount': string;

package/lib/locales/zh-CN.js

@@ -214,7 +214,7 @@ var zh_CN_default = {
   "pisell-action-get-data": "请先获取数据",
   "pisell-action-delete-success": "删除成功",
   "pisell-action-delete-failed": "删除失败,请重试",
-  "walletCard-piont": "积分",
+  "walletCard-point": "积分",
   "walletCard-rechargeable": "余额",
   "walletCard-voucher": "代金券",
   "walletCard-discount": "折扣卡",

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

@@ -174,7 +174,7 @@ declare const _default: {
     'pisell-action-get-data': string;
     'pisell-action-delete-success': string;
     'pisell-action-delete-failed': string;
-    'walletCard-piont': string;
+    'walletCard-point': string;
     'walletCard-rechargeable': string;
     'walletCard-voucher': string;
     'walletCard-discount': string;

package/lib/locales/zh-TW.js

@@ -214,7 +214,7 @@ var zh_TW_default = {
   "pisell-action-get-data": "請先獲取數據",
   "pisell-action-delete-success": "刪除成功",
   "pisell-action-delete-failed": "刪除失敗,請重試",
-  "walletCard-piont": "積分",
+  "walletCard-point": "積分",
   "walletCard-rechargeable": "餘額",
   "walletCard-voucher": "代金券",
   "walletCard-discount": "折扣卡",

package/lib/typings.d.ts

@@ -1,4 +1,10 @@
 declare module '*.png' {
   const content: string;
   export default content;
-} 
+} 
+
+namespace JSX {
+  interface IntrinsicElements {
+    [elemName: string]: any;
+  }
+}

package/lowcode/pisell-text.editable/meta.ts

@@ -0,0 +1,115 @@
+import snippets from './snippets';
+
+export default {
+  snippets,
+  componentName: 'PisellText.Editable',
+  title: '可编辑文本',
+  category: '数据输入',
+  docUrl: '',
+  screenshot: '',
+  devMode: 'proCode',
+  npm: {
+    package: '@pisell/materials',
+    version: '1.0.1',
+    exportName: 'PisellText',
+    main: 'src/index.tsx',
+    destructuring: true,
+    subName: 'Editable',
+  },
+  props: [
+    {
+      name: 'value',
+      title: {
+        label: '文本内容',
+        tip: '文本内容，支持字符串或多语言对象'
+      },
+      propType: {
+        type: 'oneOfType',
+        value: ['string', 'object']
+      },
+      setter: {
+        componentName: 'MixedSetter',
+        props: {
+          setters: [
+            'StringSetter',
+            'JsonSetter'
+          ]
+        }
+      },
+    },
+    {
+      name: 'editable',
+      title: {
+        label: '启用编辑',
+        tip: '启用编辑功能，支持布尔值或详细配置对象',
+      },
+      propType: {
+        type: 'oneOfType',
+        value: ['bool', 'object']
+      },
+      setter: {
+        componentName: 'MixedSetter',
+        props: {
+          setters: [
+            'BoolSetter',
+            {
+              componentName: 'ObjectSetter',
+              props: {
+                config: {
+                  items: [
+                    {
+                      name: 'disabled',
+                      title: { label: '禁用编辑', tip: '是否禁用编辑功能' },
+                      propType: 'bool',
+                      setter: 'BoolSetter',
+                      defaultValue: false,
+                    },
+                    {
+                      name: 'maxLength',
+                      title: { label: '最大长度', tip: '编辑时的最大字符长度' },
+                      propType: 'number',
+                      setter: 'NumberSetter',
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      },
+      defaultValue: false,
+    },
+    {
+      name: 'size',
+      title: { label: '尺寸', tip: '输入框尺寸' },
+      propType: { type: 'oneOf', value: ['large', 'middle', 'small'] },
+      setter: [
+        {
+          componentName: 'RadioGroupSetter',
+          props: {
+            options: [
+              { title: 'Large', value: 'large' },
+              { title: 'Middle', value: 'middle' },
+              { title: 'Small', value: 'small' },
+            ]
+          }
+        },
+        'VariableSetter'
+      ],
+      defaultValue: 'middle',
+    },
+    {
+      name: 'className',
+      title: { label: '类名', tip: '自定义CSS类名' },
+      propType: 'string',
+      setter: 'StringSetter',
+    },
+  ],
+  configure: {
+    supports: {
+      style: true,
+      className: true,
+      events: ['onChange'],
+    }
+  },
+};

package/lowcode/pisell-text.editable/snippets.ts

@@ -0,0 +1,15 @@
+export default [
+  {
+    title: '可编辑文本',
+    schema: {
+      componentName: 'PisellText.Editable',
+      props: {
+        value: '可编辑的文本内容',
+        editable: {
+          maxLength: 50,
+          disabled: false,
+        },
+      },
+    },
+  },
+];

package/lowcode/sortable-list/meta.ts

@@ -70,7 +70,7 @@ export default {
               title: '渲染函数插槽',
               initialValue: {
                 type: 'JSSlot',
-                params: ['item'],
+                params: ['item', 'index'],
                 value: [
                   {
                     componentName: 'Button',

package/lowcode/wallet-card/meta.ts

@@ -241,6 +241,26 @@ export default {
           setter: 'BoolSetter',
           defaultValue: false,
         },
+        {
+          name: 'codeType',
+          title: {
+            label: {
+              type: 'i18n',
+              'en-US': 'Code Type',
+              'zh-CN': '条码类型',
+            },
+          },
+          setter: {
+            componentName: 'RadioGroupSetter',
+            props: {
+              options: [
+                { title: '条形码', value: 'barCode' },
+                { title: '二维码', value: 'qrCode' },
+              ],
+            },
+          },
+          defaultValue: 'qrCode',
+        },
       ],
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "6.3.9",
+  "version": "6.3.10",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",