@pisell/materials 1.0.757 → 1.0.758

package/es/components/pisellWalletPassCard/index.js

@@ -13,9 +13,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useMemo } from 'react';
 import classNames from 'classnames';
 import { CheckCircleFilled, EditOutlined, ExclamationCircleOutlined, MoreOutlined } from '@ant-design/icons';
-import { Button, Dropdown, Form, Modal, Input, InputNumber, DatePicker } from 'antd';
+import { Dropdown, Form, Input, InputNumber, DatePicker } from 'antd';
 import dayjs from 'dayjs';
 import Iconfont from "../iconfont";
+import { PisellModal } from "../../index";
 import Amount from "../pisellText/components/Amount";
 
 // @ts-ignore
@@ -168,6 +169,7 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
     form.validateFields().then(function (values) {
       var _values$validDate;
       onConfirmEdit === null || onConfirmEdit === void 0 ? void 0 : onConfirmEdit(_objectSpread(_objectSpread({
+        id: id,
         name: name,
         storeName: storeName,
         balance: balance,
@@ -310,7 +312,7 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
   };
   var renderEditModal = function renderEditModal() {
     var _actions$edit4, _actions$edit5;
-    return /*#__PURE__*/React.createElement(Modal, {
+    return /*#__PURE__*/React.createElement(PisellModal, {
       title: (actions === null || actions === void 0 ? void 0 : (_actions$edit4 = actions.edit) === null || _actions$edit4 === void 0 ? void 0 : _actions$edit4.dialogTitle) || getText('pisell-wallet-pass-card-edit'),
       open: isShowEdit,
       className: "pisell-wallet-pass-card-edit-modal",
@@ -318,26 +320,15 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
         return setIsShowEdit(false);
       },
       width: 480,
-      footer: /*#__PURE__*/React.createElement("div", {
-        style: {
-          display: 'flex',
-          justifyContent: 'space-between',
-          padding: '16px 24px',
-          gap: 12
-        }
-      }, /*#__PURE__*/React.createElement(Button, {
-        block: true,
-        onClick: function onClick() {
-          return setIsShowEdit(false);
-        }
-      }, getText('pisell-wallet-pass-card-cancel')), /*#__PURE__*/React.createElement(Button, {
-        type: "primary",
-        block: true,
-        onClick: _onConfirmEdit
-      }, getText('pisell-wallet-pass-card-confirm')))
+      onOk: _onConfirmEdit,
+      okText: getText('pisell-wallet-pass-card-confirm'),
+      cancelText: getText('pisell-wallet-pass-card-cancel')
     }, /*#__PURE__*/React.createElement(Form, {
       form: form,
-      layout: 'vertical'
+      layout: 'vertical',
+      style: {
+        padding: '16px 0'
+      }
     }, Array.isArray(actions === null || actions === void 0 ? void 0 : (_actions$edit5 = actions.edit) === null || _actions$edit5 === void 0 ? void 0 : _actions$edit5.fields) && actions.edit.fields.map(function (item) {
       return /*#__PURE__*/React.createElement(Form.Item, {
         key: item.name,
@@ -351,7 +342,7 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
     })));
   };
   var renderDetailModal = function renderDetailModal() {
-    return /*#__PURE__*/React.createElement(Modal, {
+    return /*#__PURE__*/React.createElement(PisellModal, {
       title: getText('pisell-wallet-pass-card-detail'),
       open: isShowDetail,
       onCancel: function onCancel() {
@@ -363,7 +354,10 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
     }, /*#__PURE__*/React.createElement(Form, {
       form: form2,
       disabled: true,
-      layout: 'vertical'
+      layout: 'vertical',
+      style: {
+        padding: '16px 0'
+      }
     }, /*#__PURE__*/React.createElement(Form.Item, {
       name: "name",
       label: getText('pisell-wallet-pass-card-name')

package/es/components/pisellWalletPassCard/index.less

@@ -246,24 +246,6 @@
 
 .pisell-wallet-pass-card-detail-modal,
 .pisell-wallet-pass-card-edit-modal {
-  .pisell-lowcode-modal-content {
-    padding: 0;
-  }
-
-  .pisell-lowcode-modal-header,
-  .pisell-lowcode-modal-body {
-    padding: 16px 24px;
-  }
-
-  .pisell-lowcode-modal-body {
-    border-top: 1px solid var(--Gray-200, #eaecf0);
-  }
-
-  .pisell-lowcode-modal-footer {
-    margin-top: 0;
-    border-top: 1px solid var(--Gray-200, #eaecf0);
-  }
-
   .pisell-lowcode-form-item {
     margin-bottom: 20px;
   }

package/lib/components/pisellWalletPassCard/index.js

@@ -38,6 +38,7 @@ var import_icons = require("@ant-design/icons");
 var import_antd = require("antd");
 var import_dayjs = __toESM(require("dayjs"));
 var import_iconfont = __toESM(require("../iconfont"));
+var import__ = require("../../index");
 var import_Amount = __toESM(require("../pisellText/components/Amount"));
 var import_index = require("./index.less");
 var import_locales = require("../../locales");
@@ -155,6 +156,7 @@ var PisellWalletPassCard = (props) => {
     form.validateFields().then((values) => {
       var _a;
       onConfirmEdit == null ? void 0 : onConfirmEdit({
+        id,
         name,
         storeName,
         balance,
@@ -265,28 +267,18 @@ var PisellWalletPassCard = (props) => {
   const renderEditModal = () => {
     var _a, _b;
     return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Modal,
+      import__.PisellModal,
       {
         title: ((_a = actions == null ? void 0 : actions.edit) == null ? void 0 : _a.dialogTitle) || (0, import_locales.getText)("pisell-wallet-pass-card-edit"),
         open: isShowEdit,
         className: "pisell-wallet-pass-card-edit-modal",
         onCancel: () => setIsShowEdit(false),
         width: 480,
-        footer: /* @__PURE__ */ import_react.default.createElement(
-          "div",
-          {
-            style: {
-              display: "flex",
-              justifyContent: "space-between",
-              padding: "16px 24px",
-              gap: 12
-            }
-          },
-          /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { block: true, onClick: () => setIsShowEdit(false) }, (0, import_locales.getText)("pisell-wallet-pass-card-cancel")),
-          /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "primary", block: true, onClick: _onConfirmEdit }, (0, import_locales.getText)("pisell-wallet-pass-card-confirm"))
-        )
+        onOk: _onConfirmEdit,
+        okText: (0, import_locales.getText)("pisell-wallet-pass-card-confirm"),
+        cancelText: (0, import_locales.getText)("pisell-wallet-pass-card-cancel")
       },
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { form, layout: "vertical" }, Array.isArray((_b = actions == null ? void 0 : actions.edit) == null ? void 0 : _b.fields) && actions.edit.fields.map((item) => {
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { form, layout: "vertical", style: { padding: "16px 0" } }, Array.isArray((_b = actions == null ? void 0 : actions.edit) == null ? void 0 : _b.fields) && actions.edit.fields.map((item) => {
         return /* @__PURE__ */ import_react.default.createElement(
           import_antd.Form.Item,
           {
@@ -307,7 +299,7 @@ var PisellWalletPassCard = (props) => {
   };
   const renderDetailModal = () => {
     return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Modal,
+      import__.PisellModal,
       {
         title: (0, import_locales.getText)("pisell-wallet-pass-card-detail"),
         open: isShowDetail,
@@ -318,61 +310,75 @@ var PisellWalletPassCard = (props) => {
         className: "pisell-wallet-pass-card-detail-modal",
         footer: null
       },
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { form: form2, disabled: true, layout: "vertical" }, /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Form.Item,
-        {
-          name: "name",
-          label: (0, import_locales.getText)("pisell-wallet-pass-card-name")
-        },
-        /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null)
-      ), /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Form.Item,
+      /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Form,
         {
-          name: "storeName",
-          label: (0, import_locales.getText)("pisell-wallet-pass-card-store-name")
-        },
-        /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null)
-      ), /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Form.Item,
-        {
-          name: "balance",
-          label: (0, import_locales.getText)("pisell-wallet-pass-card-balance")
+          form: form2,
+          disabled: true,
+          layout: "vertical",
+          style: { padding: "16px 0" }
         },
         /* @__PURE__ */ import_react.default.createElement(
-          import_antd.InputNumber,
+          import_antd.Form.Item,
           {
-            formatter: (value) => `$ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ","),
-            style: { width: "100%" }
-          }
-        )
-      ), /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Form.Item,
-        {
-          name: "redeem",
-          label: (0, import_locales.getText)("pisell-wallet-pass-card-redeem")
-        },
+            name: "name",
+            label: (0, import_locales.getText)("pisell-wallet-pass-card-name")
+          },
+          /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null)
+        ),
         /* @__PURE__ */ import_react.default.createElement(
-          import_antd.InputNumber,
+          import_antd.Form.Item,
           {
-            formatter: (value) => `$ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ","),
-            style: { width: "100%" }
-          }
+            name: "storeName",
+            label: (0, import_locales.getText)("pisell-wallet-pass-card-store-name")
+          },
+          /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null)
+        ),
+        /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Form.Item,
+          {
+            name: "balance",
+            label: (0, import_locales.getText)("pisell-wallet-pass-card-balance")
+          },
+          /* @__PURE__ */ import_react.default.createElement(
+            import_antd.InputNumber,
+            {
+              formatter: (value) => `$ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ","),
+              style: { width: "100%" }
+            }
+          )
+        ),
+        /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Form.Item,
+          {
+            name: "redeem",
+            label: (0, import_locales.getText)("pisell-wallet-pass-card-redeem")
+          },
+          /* @__PURE__ */ import_react.default.createElement(
+            import_antd.InputNumber,
+            {
+              formatter: (value) => `$ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ","),
+              style: { width: "100%" }
+            }
+          )
+        ),
+        /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Form.Item,
+          {
+            name: "code",
+            label: (0, import_locales.getText)("pisell-wallet-pass-card-code")
+          },
+          /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null)
+        ),
+        /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Form.Item,
+          {
+            name: "validDate",
+            label: (0, import_locales.getText)("pisell-wallet-pass-card-valid-to")
+          },
+          /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null)
         )
-      ), /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Form.Item,
-        {
-          name: "code",
-          label: (0, import_locales.getText)("pisell-wallet-pass-card-code")
-        },
-        /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null)
-      ), /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Form.Item,
-        {
-          name: "validDate",
-          label: (0, import_locales.getText)("pisell-wallet-pass-card-valid-to")
-        },
-        /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null)
-      ))
+      )
     );
   };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, renderDetailModal(), renderEditModal(), /* @__PURE__ */ import_react.default.createElement(

package/lib/components/pisellWalletPassCard/index.less

@@ -246,24 +246,6 @@
 
 .pisell-wallet-pass-card-detail-modal,
 .pisell-wallet-pass-card-edit-modal {
-  .pisell-lowcode-modal-content {
-    padding: 0;
-  }
-
-  .pisell-lowcode-modal-header,
-  .pisell-lowcode-modal-body {
-    padding: 16px 24px;
-  }
-
-  .pisell-lowcode-modal-body {
-    border-top: 1px solid var(--Gray-200, #eaecf0);
-  }
-
-  .pisell-lowcode-modal-footer {
-    margin-top: 0;
-    border-top: 1px solid var(--Gray-200, #eaecf0);
-  }
-
   .pisell-lowcode-form-item {
     margin-bottom: 20px;
   }

package/lowcode/pisell-wallet-pass-card/actionsMeta.ts

@@ -164,6 +164,7 @@ export const actionsMeta = {
               itemSetter: {
                 componentName: 'ObjectSetter',
                 props: {
+                  descriptor: 'name',
                   config: {
                     items: [
                       {

package/package.json

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