ts-glitter 21.1.5 → 21.1.7

package/lowcode/official_view_component/official/component.ts

@@ -877,6 +877,7 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
                                                                 gvc.glitter.share.editorViewModel.selectItem =
                                                                   undefined;
                                                                 gvc.glitter.share.selectEditorItem();
+                                                                
                                                                 // if (select_.container_cf) {
                                                                 //   const gvc_ =
                                                                 //     gvc.glitter.document.querySelector('.iframe_view')

package/lowcode/public-components/checkout/index.js

@@ -1941,7 +1941,38 @@ export class CheckoutIndex {
                                             ].join('');
                                         }
                                         catch (e) {
-                                            console.error(`error 3 =>`, e);
+                                            console.error(`error 3-1 =>`, e);
+                                            return '';
+                                        }
+                                    })()}
+                                      ${(() => {
+                                        var _a, _b;
+                                        try {
+                                            vm.cartData.user_info.custom_form_payment =
+                                                (_a = vm.cartData.user_info.custom_form_payment) !== null && _a !== void 0 ? _a : {};
+                                            const formData = (_b = vm.cartData.payment_customer_form.find((dd) => {
+                                                return vm.cartData.customer_info.payment_select === dd.id;
+                                            })) === null || _b === void 0 ? void 0 : _b.list;
+                                            if (!formData) {
+                                                return '';
+                                            }
+                                            const form_array = JSON.parse(JSON.stringify(formData));
+                                            form_array.map((dd) => {
+                                                return formatterFormElement(dd);
+                                            });
+                                            return [
+                                                FormWidget.editorView({
+                                                    gvc: gvc,
+                                                    array: form_array,
+                                                    refresh: () => {
+                                                        this.storeLocalData(vm.cartData);
+                                                    },
+                                                    formData: vm.cartData.user_info.custom_form_payment,
+                                                }),
+                                            ].join('');
+                                        }
+                                        catch (e) {
+                                            console.error(`error 3-2 =>`, e);
                                             return '';
                                         }
                                     })()}

package/lowcode/public-components/checkout/index.ts

@@ -2146,7 +2146,38 @@ export class CheckoutIndex {
                                             }),
                                           ].join('');
                                         } catch (e) {
-                                          console.error(`error 3 =>`, e);
+                                          console.error(`error 3-1 =>`, e);
+                                          return '';
+                                        }
+                                      })()}
+                                      ${(() => {
+                                        try {
+                                          vm.cartData.user_info.custom_form_payment =
+                                            vm.cartData.user_info.custom_form_payment ?? {};
+
+                                          const formData = vm.cartData.payment_customer_form.find((dd: any) => {
+                                            return vm.cartData.customer_info.payment_select === dd.id;
+                                          })?.list;
+
+                                          if (!formData) {
+                                            return '';
+                                          }
+                                          const form_array = JSON.parse(JSON.stringify(formData));
+                                          form_array.map((dd: any) => {
+                                            return formatterFormElement(dd);
+                                          });
+                                          return [
+                                            FormWidget.editorView({
+                                              gvc: gvc,
+                                              array: form_array,
+                                              refresh: () => {
+                                                this.storeLocalData(vm.cartData);
+                                              },
+                                              formData: vm.cartData.user_info.custom_form_payment,
+                                            }),
+                                          ].join('');
+                                        } catch (e) {
+                                          console.error(`error 3-2 =>`, e);
                                           return '';
                                         }
                                       })()}

package/lowcode/public-components/product/pd-card-01.js

@@ -1,15 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { ApiShop } from '../../glitter-base/route/shopping.js';
-import { GlobalUser } from '../../glitter-base/global/global-user.js';
-import { CheckInput } from '../../modules/checkInput.js';
 import { PdClass } from './pd-class.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
 import { Language } from '../../glitter-base/global/language.js';
@@ -234,52 +222,6 @@ export class ProductCard01 {
           </div>
         </div>
       </div>
-      <div
-        class="wishBt wish-button ${window.store_info.wishlist === false ? 'd-none' : 'd-flex'}"
-        onclick="${gvc.event((e, event) => {
-            event.stopPropagation();
-            if (CheckInput.isEmpty(GlobalUser.token)) {
-                changePage('login', 'page', {});
-                return;
-            }
-            if (vm.wishStatus) {
-                ApiShop.deleteWishList(`${prod.id}`).then(() => __awaiter(this, void 0, void 0, function* () {
-                    PdClass.jumpAlert({
-                        gvc,
-                        text: Language.text('delete_success'),
-                        justify: 'top',
-                        align: 'center',
-                    });
-                    vm.wishStatus = !vm.wishStatus;
-                    gvc.notifyDataChange(wishId);
-                }));
-            }
-            else {
-                ApiShop.postWishList(`${prod.id}`).then(() => __awaiter(this, void 0, void 0, function* () {
-                    PdClass.jumpAlert({
-                        gvc,
-                        text: Language.text('add_success'),
-                        justify: 'top',
-                        align: 'center',
-                    });
-                    vm.wishStatus = !vm.wishStatus;
-                    gvc.notifyDataChange(wishId);
-                }));
-            }
-        })}"
-      >
-        ${gvc.bindView({
-            bind: wishId,
-            view: () => {
-                if (vm.wishStatus) {
-                    return html ` <i class="fa-solid fa-heart" style="color: #da1313"></i>`;
-                }
-                else {
-                    return html ` <i class="fa-regular fa-heart"></i>`;
-                }
-            },
-        })}
-      </div>
       <div class="card-collapse-parent cursor_pointer">
         <div>
           <div class="row gx-0 card-title-container mb-1">

package/lowcode/public-components/product/pd-card-01.ts

@@ -240,51 +240,6 @@ export class ProductCard01 {
           </div>
         </div>
       </div>
-      <div
-        class="wishBt wish-button ${(window as any).store_info.wishlist === false ? 'd-none' : 'd-flex'}"
-        onclick="${gvc.event((e, event) => {
-          event.stopPropagation();
-          if (CheckInput.isEmpty(GlobalUser.token)) {
-            changePage('login', 'page', {});
-            return;
-          }
-
-          if (vm.wishStatus) {
-            ApiShop.deleteWishList(`${prod.id}`).then(async () => {
-              PdClass.jumpAlert({
-                gvc,
-                text: Language.text('delete_success'),
-                justify: 'top',
-                align: 'center',
-              });
-              vm.wishStatus = !vm.wishStatus;
-              gvc.notifyDataChange(wishId);
-            });
-          } else {
-            ApiShop.postWishList(`${prod.id}`).then(async () => {
-              PdClass.jumpAlert({
-                gvc,
-                text: Language.text('add_success'),
-                justify: 'top',
-                align: 'center',
-              });
-              vm.wishStatus = !vm.wishStatus;
-              gvc.notifyDataChange(wishId);
-            });
-          }
-        })}"
-      >
-        ${gvc.bindView({
-          bind: wishId,
-          view: () => {
-            if (vm.wishStatus) {
-              return html` <i class="fa-solid fa-heart" style="color: #da1313"></i>`;
-            } else {
-              return html` <i class="fa-regular fa-heart"></i>`;
-            }
-          },
-        })}
-      </div>
       <div class="card-collapse-parent cursor_pointer">
         <div>
           <div class="row gx-0 card-title-container mb-1">

package/lowcode/public-components/product/pd-card-02.js

@@ -1,18 +1,5 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { ApiShop } from '../../glitter-base/route/shopping.js';
-import { GlobalUser } from '../../glitter-base/global/global-user.js';
-import { CheckInput } from '../../modules/checkInput.js';
 import { PdClass } from './pd-class.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
-import { Language } from '../../glitter-base/global/language.js';
 const html = String.raw;
 export class ProductCard02 {
     static main(gvc, widget, subData) {
@@ -206,52 +193,7 @@ export class ProductCard02 {
         })}"
         />
       </div>
-      <div
-        class="wishBt wish-button ${window.store_info.wishlist === false ? 'd-none' : 'd-flex'}"
-        onclick="${gvc.event((_, event) => {
-            event.stopPropagation();
-            if (CheckInput.isEmpty(GlobalUser.token)) {
-                changePage('login', 'page', {});
-                return;
-            }
-            if (vm.wishStatus) {
-                ApiShop.deleteWishList(`${prod.id}`).then(() => __awaiter(this, void 0, void 0, function* () {
-                    PdClass.jumpAlert({
-                        gvc,
-                        text: Language.text('delete_success'),
-                        justify: 'top',
-                        align: 'center',
-                    });
-                    vm.wishStatus = !vm.wishStatus;
-                    gvc.notifyDataChange(wishId);
-                }));
-            }
-            else {
-                ApiShop.postWishList(`${prod.id}`).then(() => __awaiter(this, void 0, void 0, function* () {
-                    PdClass.jumpAlert({
-                        gvc,
-                        text: Language.text('add_success'),
-                        justify: 'top',
-                        align: 'center',
-                    });
-                    vm.wishStatus = !vm.wishStatus;
-                    gvc.notifyDataChange(wishId);
-                }));
-            }
-        })}"
-      >
-        ${gvc.bindView({
-            bind: wishId,
-            view: () => {
-                if (vm.wishStatus) {
-                    return html ` <i class="fa-solid fa-heart" style="color: #da1313"></i>`;
-                }
-                else {
-                    return html ` <i class="fa-regular fa-heart"></i>`;
-                }
-            },
-        })}
-      </div>
+      
       <div class="card-collapse-parent">
         <div class="d-flex card-title-container justify-content-between align-items-center">
           <div class="row gx-0 mb-1" style="max-width:calc(100% - 50px);">

package/lowcode/public-components/product/pd-card-02.ts

@@ -212,51 +212,7 @@ export class ProductCard02 {
           })}"
         />
       </div>
-      <div
-        class="wishBt wish-button ${(window as any).store_info.wishlist === false ? 'd-none' : 'd-flex'}"
-        onclick="${gvc.event((_, event) => {
-          event.stopPropagation();
-          if (CheckInput.isEmpty(GlobalUser.token)) {
-            changePage('login', 'page', {});
-            return;
-          }
-
-          if (vm.wishStatus) {
-            ApiShop.deleteWishList(`${prod.id}`).then(async () => {
-              PdClass.jumpAlert({
-                gvc,
-                text: Language.text('delete_success'),
-                justify: 'top',
-                align: 'center',
-              });
-              vm.wishStatus = !vm.wishStatus;
-              gvc.notifyDataChange(wishId);
-            });
-          } else {
-            ApiShop.postWishList(`${prod.id}`).then(async () => {
-              PdClass.jumpAlert({
-                gvc,
-                text: Language.text('add_success'),
-                justify: 'top',
-                align: 'center',
-              });
-              vm.wishStatus = !vm.wishStatus;
-              gvc.notifyDataChange(wishId);
-            });
-          }
-        })}"
-      >
-        ${gvc.bindView({
-          bind: wishId,
-          view: () => {
-            if (vm.wishStatus) {
-              return html` <i class="fa-solid fa-heart" style="color: #da1313"></i>`;
-            } else {
-              return html` <i class="fa-regular fa-heart"></i>`;
-            }
-          },
-        })}
-      </div>
+      
       <div class="card-collapse-parent">
         <div class="d-flex card-title-container justify-content-between align-items-center">
           <div class="row gx-0 mb-1" style="max-width:calc(100% - 50px);">

package/lowcode/public-components/product/pd-card-03.js

@@ -1,15 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { ApiShop } from '../../glitter-base/route/shopping.js';
-import { GlobalUser } from '../../glitter-base/global/global-user.js';
-import { CheckInput } from '../../modules/checkInput.js';
 import { PdClass } from './pd-class.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
 import { Language } from '../../glitter-base/global/language.js';
@@ -211,54 +199,9 @@ export class ProductCard03 {
         })}"
         />
       </div>
-      <div
-        class="wishBt wish-button ${window.store_info.wishlist === false ? 'd-none' : 'd-flex'}"
-        onclick="${gvc.event((_, event) => {
-            event.stopPropagation();
-            if (CheckInput.isEmpty(GlobalUser.token)) {
-                changePage('login', 'page', {});
-                return;
-            }
-            if (vm.wishStatus) {
-                ApiShop.deleteWishList(`${prod.id}`).then(() => __awaiter(this, void 0, void 0, function* () {
-                    PdClass.jumpAlert({
-                        gvc,
-                        text: Language.text('delete_success'),
-                        justify: 'top',
-                        align: 'center',
-                    });
-                    vm.wishStatus = !vm.wishStatus;
-                    gvc.notifyDataChange(wishId);
-                }));
-            }
-            else {
-                ApiShop.postWishList(`${prod.id}`).then(() => __awaiter(this, void 0, void 0, function* () {
-                    PdClass.jumpAlert({
-                        gvc,
-                        text: Language.text('add_success'),
-                        justify: 'top',
-                        align: 'center',
-                    });
-                    vm.wishStatus = !vm.wishStatus;
-                    gvc.notifyDataChange(wishId);
-                }));
-            }
-        })}"
-      >
-        ${gvc.bindView({
-            bind: wishId,
-            view: () => {
-                if (vm.wishStatus) {
-                    return html ` <i class="fa-solid fa-heart" style="color: #da1313"></i>`;
-                }
-                else {
-                    return html ` <i class="fa-regular fa-heart"></i>`;
-                }
-            },
-        })}
-      </div>
+      
       <div class="card-collapse-parent">
-        <div class="card-title-container">
+        <div class="card-title-container" style="min-height:auto;">
           <div class="row gx-0 mb-2">
             <div class="col-12 mb-1">
               <div class="w-100 d-flex ${PdClass.isPad() ? 'justify-content-center' : ''}">

package/lowcode/public-components/product/pd-card-03.ts

@@ -218,53 +218,9 @@ export class ProductCard03 {
           })}"
         />
       </div>
-      <div
-        class="wishBt wish-button ${(window as any).store_info.wishlist === false ? 'd-none' : 'd-flex'}"
-        onclick="${gvc.event((_, event) => {
-          event.stopPropagation();
-          if (CheckInput.isEmpty(GlobalUser.token)) {
-            changePage('login', 'page', {});
-            return;
-          }
-
-          if (vm.wishStatus) {
-            ApiShop.deleteWishList(`${prod.id}`).then(async () => {
-              PdClass.jumpAlert({
-                gvc,
-                text: Language.text('delete_success'),
-                justify: 'top',
-                align: 'center',
-              });
-              vm.wishStatus = !vm.wishStatus;
-              gvc.notifyDataChange(wishId);
-            });
-          } else {
-            ApiShop.postWishList(`${prod.id}`).then(async () => {
-              PdClass.jumpAlert({
-                gvc,
-                text: Language.text('add_success'),
-                justify: 'top',
-                align: 'center',
-              });
-              vm.wishStatus = !vm.wishStatus;
-              gvc.notifyDataChange(wishId);
-            });
-          }
-        })}"
-      >
-        ${gvc.bindView({
-          bind: wishId,
-          view: () => {
-            if (vm.wishStatus) {
-              return html` <i class="fa-solid fa-heart" style="color: #da1313"></i>`;
-            } else {
-              return html` <i class="fa-regular fa-heart"></i>`;
-            }
-          },
-        })}
-      </div>
+      
       <div class="card-collapse-parent">
-        <div class="card-title-container">
+        <div class="card-title-container" style="min-height:auto;">
           <div class="row gx-0 mb-2">
             <div class="col-12 mb-1">
               <div class="w-100 d-flex ${PdClass.isPad() ? 'justify-content-center' : ''}">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "21.1.5",
+  "version": "21.1.7",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -98,3 +98,5 @@
     "terser": "^5.19.2"
   }
 }
+
+

package/src/api-public/services/financial-serviceV2.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };