@pisell/materials 6.4.18 → 6.4.19

package/lib/components/productCard/utils.js

@@ -95,13 +95,6 @@ var getServiceTime = (item, currentDate) => {
       } else {
         dateTime = `${startDate.format(dateFormat)} ${startTime} ~ ${endDate.format(dateFormat)} ${endTime}`;
       }
-      if (durationType === "days") {
-        dateTime = formatMultiDayDate({
-          start_date: startDate.format("YYYY-MM-DD"),
-          end_date: endDate.format("YYYY-MM-DD"),
-          locale
-        });
-      }
     }
     const startDateTime = `${startDate.format("YYYY-MM-DD")} ${startTime}`;
     const endDateTime = `${endDate.format("YYYY-MM-DD")} ${endTime}`;
@@ -112,7 +105,7 @@ var getServiceTime = (item, currentDate) => {
       const minutes = _duration % 60;
       durationText = import_utils.locales.getText("pisell2.product.card.hour.minute")(hours, minutes);
     } else if (durationType === "days") {
-      durationText = `${_duration}${import_utils.locales.getText("pisell2.product.card.day")(_duration)}`;
+      durationText = import_utils.locales.getText("pisell2.product.card.day")(_duration);
     } else {
       durationText = `${_duration}`;
     }

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

@@ -0,0 +1,9 @@
+import React from 'react';
+import { Select as OriginalSelect } from 'antd';
+import type { SelectProps } from 'antd';
+import './index.less';
+interface CompoundedComponent extends React.ForwardRefExoticComponent<SelectProps> {
+    Option: typeof OriginalSelect.Option;
+}
+declare const Select: CompoundedComponent;
+export default Select;

package/lib/components/select/index.js

@@ -51,6 +51,7 @@ var SelectBase = (0, import_react.forwardRef)((props, ref) => {
     options,
     dropdownRender: propsDropdownRender,
     showSearch,
+    onSearch,
     styleType,
     optionFilterProp = "value",
     popupClassName,
@@ -111,7 +112,10 @@ var SelectBase = (0, import_react.forwardRef)((props, ref) => {
           size: "middle",
           placeholder: (0, import_locales.getText)("select-dropdown-render-search"),
           value: searchValue,
-          onChange: (e) => setSearchValue(e.target.value),
+          onChange: (e) => {
+            onSearch == null ? void 0 : onSearch(e.target.value);
+            setSearchValue(e.target.value);
+          },
           bordered: false,
           allowClear: true,
           prefix: /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { style: { color: "#98A2B3" }, type: "pisell2-search-lg" })
@@ -142,7 +146,8 @@ var SelectBase = (0, import_react.forwardRef)((props, ref) => {
       checkboxChecked,
       propsDropdownRender,
       searchValue,
-      showSearch
+      showSearch,
+      onSearch
     ]
   );
   if (styleType === "system") {

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

@@ -0,0 +1,11 @@
+import React from "react";
+import { Props } from "../DragSortList";
+export interface SortableListProps<T> {
+    dataSource: Props<T>["list"];
+    onChange: Props<T>["onChange"];
+    rowKey: Props<T>["rowKey"];
+    renderItem?: (item: T, index: number) => React.ReactNode;
+    activationConstraint?: Props<T>["activationConstraint"];
+}
+declare const SortableList: React.FC<SortableListProps<any>>;
+export default SortableList;

package/lib/components/sortableList/index.js

@@ -54,8 +54,8 @@ var SortableList = (props) => {
       activationConstraint
     },
     (params) => {
-      const { item, props: p, attributes, listeners, style } = params;
-      return /* @__PURE__ */ import_react.default.createElement("div", { ...p, ...attributes, ...listeners, style }, renderItem == null ? void 0 : renderItem(item));
+      const { item, index, props: p, attributes, listeners, style } = params;
+      return /* @__PURE__ */ import_react.default.createElement("div", { ...p, ...attributes, ...listeners, style }, renderItem == null ? void 0 : renderItem(item, index));
     }
   );
 };

package/lib/components/table/Actions/component/ExportImport/components/ExportTable/function.d.ts

@@ -0,0 +1,7 @@
+interface IExportParams {
+    type: string;
+    originDataSource: any[];
+    currentDataSource: any[];
+}
+export declare const batchExport: (exportParams: IExportParams, exportImport: any) => Promise<true | undefined>;
+export {};

package/lib/components/table/Actions/component/ExportImport/components/ExportTable/function.js

@@ -27,6 +27,11 @@ var import_locales = require("../../../../../../../locales/index");
 var import_serve = require("../../../../../serve");
 var import_status = require("../../../../../status");
 var import_file = require("../../utils/file");
+var exportImportTypeMap = {
+  "current-page": "page",
+  "all-records": "all",
+  "selected-records": "select"
+};
 var _batchExport = async (params) => {
   let { status } = await (0, import_serve.exportData)(params);
   if (status) {
@@ -42,7 +47,7 @@ var _batchExport = async (params) => {
 var batchExport = (exportParams, exportImport) => {
   const { selectLists, apiUrl, otherParams } = exportImport;
   let _name = (0, import_file.getFileDateName)();
-  let params = { ...otherParams };
+  let params = (otherParams == null ? void 0 : otherParams.export) ? { ...otherParams == null ? void 0 : otherParams.export } : { ...otherParams };
   params.url = apiUrl == null ? void 0 : apiUrl.export;
   console.log("exportParams", exportParams);
   const type = (exportParams == null ? void 0 : exportParams.type) || import_status.defaultOptions.exportType;
@@ -74,6 +79,7 @@ var batchExport = (exportParams, exportImport) => {
   } else {
     params == null ? true : delete params.ids;
   }
+  params.export_select = exportImportTypeMap[type];
   return _batchExport(params);
 };
 // Annotate the CommonJS export names for ESM import in node:

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/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import './index.less';
+declare const _default: React.NamedExoticComponent<any>;
+export default _default;

package/lib/components/table/Table/index.js

@@ -71,10 +71,13 @@ var GridViewTable = ({
       payload: newData
     });
   });
-  const handleResize = (index) => (e, { size }) => {
-    const nextColumns = [...columns];
-    nextColumns[index] = {
-      ...nextColumns[index],
+  const handleResize = (index, record) => (e, { size }) => {
+    const findIndex = column_setting.findIndex(
+      (item) => item.dataIndex === record.dataIndex
+    );
+    const nextColumns = [...column_setting];
+    nextColumns[findIndex] = {
+      ...nextColumns[findIndex],
       width: size.width
     };
     form.setFieldValue("column_setting", nextColumns);
@@ -108,6 +111,7 @@ var GridViewTable = ({
   const components = (0, import_useGenTableComponents.default)({
     form
   });
+  console.log(columns, "columns12");
   const showTotal = (0, import_react.useCallback)(
     (total, range, pageSize) => {
       let start = range[0] - 1;

package/lib/components/table/hooks/useTransColumns.d.ts

@@ -0,0 +1,14 @@
+import { FormInstance } from "antd/es/form";
+declare type UseTransColumnsProps = {
+    columns: Record<string, any>[];
+    form: FormInstance;
+    localPagination: boolean;
+    handleSave?: (row: Record<string, any>) => void;
+    handleResize?: (index: number, record: Record<string, any>) => (e: any, p2: any) => void;
+    dragSort: boolean;
+    bordered: boolean;
+};
+declare const useTransColumns: (params: UseTransColumnsProps) => {
+    columns: any[];
+};
+export default useTransColumns;

package/lib/components/table/hooks/useTransColumns.js

@@ -196,7 +196,7 @@ var useTransColumns = (params) => {
         onHeaderCell: (record) => ({
           record,
           ...item,
-          onResize: handleResize == null ? void 0 : handleResize(index),
+          onResize: handleResize == null ? void 0 : handleResize(index, record),
           position
         })
       };

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

@@ -0,0 +1,4 @@
+import React from 'react';
+import './index.less';
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+export default _default;

package/lib/components/table/index.js

@@ -266,7 +266,9 @@ var GridView = (0, import_model.Provider)(
           try {
             if (!tableId) return {};
             const setting = (0, import_utils.getTableSettingByCurrentViewMode)(tableId, currentViewMode);
-            return (setting == null ? void 0 : setting.filters) || {};
+            const filters = (setting == null ? void 0 : setting.filters) || {};
+            filters.order_by = (setting == null ? void 0 : setting.order_by) || "";
+            return filters;
           } catch (e) {
             return {};
           }

package/lib/components/table/serve.d.ts

@@ -0,0 +1,13 @@
+declare type exportParams = {
+    ids?: Array<string | number>;
+    file_name?: string;
+    form_id?: string | number;
+    code?: string;
+    url?: string;
+};
+export declare const exportData: (params: exportParams) => Promise<any>;
+export declare const batchImport: (params: any) => Promise<any>;
+export declare const importTemplate: (params: exportParams) => Promise<any>;
+export declare const getExportFile: (params: any) => Promise<any>;
+export declare const getImportLog: (params: any) => Promise<any>;
+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

@@ -0,0 +1,17 @@
+import { Component } from 'react';
+import { TabsProps } from 'antd';
+import './index.less';
+declare class Tabs extends Component<any> {
+    state: {
+        activeKey: any;
+    };
+    componentDidMount(): void;
+    componentDidUpdate(prevProps: Readonly<any>): void;
+    private _handleChange;
+    setActiveKey: (key: string) => void;
+    getActiveKey: () => any;
+    renderIconLabelTabBar: TabsProps['renderTabBar'];
+    filterHiddenTabs: (tabs: any[]) => any[];
+    render(): JSX.Element;
+}
+export default Tabs;

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/virtual-keyboard/Amount/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { AmountProps, RightItemsStyleProps } from './types';
 import './index.less';
 export type { AmountProps, RightItemsStyleProps };

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: () => {
       }
     });