ts-glitter 13.8.813 → 13.8.815

package/lowcode/Entry.js

@@ -70,7 +70,7 @@ export class Entry {
         }
         window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
         console.log(`Entry-time:`, window.renderClock.stop());
-        glitter.share.editerVersion = 'V_13.8.813';
+        glitter.share.editerVersion = 'V_13.8.815';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -71,7 +71,7 @@ export class Entry {
         }
         (window as any).renderClock = (window as any).renderClock ?? clockF();
         console.log(`Entry-time:`, (window as any).renderClock.stop());
-        glitter.share.editerVersion = 'V_13.8.813';
+        glitter.share.editerVersion = 'V_13.8.815';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;

package/lowcode/backend-manager/bg-widget.js

@@ -2601,7 +2601,7 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                 id: obj.gvc.glitter.getUUID(),
                 loading: false,
             };
-            return html ` <div class="bg-white shadow rounded-3" style="overflow-y: auto; width: calc(100% - ${document.body.clientWidth > 768 ? 70 : 0}px); height: calc(100% - 70px);">
+            return html ` <div class="bg-white shadow ${document.body.clientWidth < 800 ? `` : `rounded-3`}" style="overflow-y: auto; width: calc(100% - ${document.body.clientWidth > 768 ? 70 : 0}px); ${document.body.clientWidth > 768 ? `height: calc(100% - 70px);` : `height:${window.parent.innerHeight}px;`};padding-top:${gvc.glitter.share.top_inset || 0}px;">
                 ${gvc.bindView({
                 bind: vm.id,
                 view: () => {

package/lowcode/backend-manager/bg-widget.ts

@@ -3067,7 +3067,7 @@ ${obj.default ?? ''}</textarea
                 loading: false,
             };
 
-            return html` <div class="bg-white shadow rounded-3" style="overflow-y: auto; width: calc(100% - ${document.body.clientWidth > 768 ? 70 : 0}px); height: calc(100% - 70px);">
+            return html` <div class="bg-white shadow ${document.body.clientWidth<800 ? ``:`rounded-3`}" style="overflow-y: auto; width: calc(100% - ${document.body.clientWidth > 768 ? 70 : 0}px); ${document.body.clientWidth > 768 ? `height: calc(100% - 70px);`:`height:${(window.parent as any).innerHeight}px;`};padding-top:${gvc.glitter.share.top_inset || 0}px;">
                 ${gvc.bindView({
                     bind: vm.id,
                     view: () => {

package/lowcode/cms-plugin/shopping-product-setting.js

@@ -1379,19 +1379,22 @@ export class ShoppingProductSetting {
                             obj.gvc.glitter.openDiaLog(new URL('../dialog/image-preview.js', import.meta.url).href, 'preview', variant.preview_image || BgWidget.noImageURL);
                         })}"
                                                               ></i>
+                                                             
                                                           </div>
                                                       </div>
                                                       <div
                                                           style="width: 136px;text-align: center;color: #36B;cursor: pointer;"
                                                           onclick="${obj.gvc.event(() => {
-                            EditorElem.uploadFileFunction({
-                                gvc: obj.gvc,
-                                callback: (text) => {
-                                    variant.preview_image = text;
+                            imageLibrary.selectImageLibrary(gvc, (urlArray) => {
+                                if (urlArray.length > 0) {
+                                    variant.preview_image = urlArray[0].data;
                                     gvc.notifyDataChange(id);
-                                },
-                                type: `image/*, video/*`,
-                            });
+                                }
+                                else {
+                                    const dialog = new ShareDialog(gvc.glitter);
+                                    dialog.errorMessage({ text: '請選擇至少一張圖片' });
+                                }
+                            }, html ` <div class="d-flex flex-column" style="border-radius: 10px 10px 0px 0px;background: #F2F2F2;">圖片庫</div>`, { mul: false });
                         })}"
                                                       >
                                                           變更
@@ -1645,6 +1648,7 @@ export class ShoppingProductSetting {
             const dialog = new ShareDialog(gvc.glitter);
             if (!variant.barcode) {
                 dialog.errorMessage({ text: '請先設定商品條碼' });
+                return;
             }
             window.parent.glitter.addMtScript([
                 {

package/lowcode/cms-plugin/shopping-product-setting.ts

@@ -1649,19 +1649,26 @@ export class ShoppingProductSetting {
                                                                       );
                                                                   })}"
                                                               ></i>
+                                                             
                                                           </div>
                                                       </div>
                                                       <div
                                                           style="width: 136px;text-align: center;color: #36B;cursor: pointer;"
                                                           onclick="${obj.gvc.event(() => {
-                                                              EditorElem.uploadFileFunction({
-                                                                  gvc: obj.gvc,
-                                                                  callback: (text) => {
-                                                                      variant.preview_image = text;
-                                                                      gvc.notifyDataChange(id);
-                                                                  },
-                                                                  type: `image/*, video/*`,
-                                                              });
+                                                              imageLibrary.selectImageLibrary(
+                                                                      gvc,
+                                                                      (urlArray) => {
+                                                                          if (urlArray.length > 0) {
+                                                                              variant.preview_image = urlArray[0].data;
+                                                                              gvc.notifyDataChange(id);
+                                                                          } else {
+                                                                              const dialog = new ShareDialog(gvc.glitter);
+                                                                              dialog.errorMessage({ text: '請選擇至少一張圖片' });
+                                                                          }
+                                                                      },
+                                                                      html` <div class="d-flex flex-column" style="border-radius: 10px 10px 0px 0px;background: #F2F2F2;">圖片庫</div>`,
+                                                                      { mul: false }
+                                                              )
                                                           })}"
                                                       >
                                                           變更
@@ -1925,6 +1932,7 @@ export class ShoppingProductSetting {
                                                 const dialog = new ShareDialog(gvc.glitter);
                                                 if (!variant.barcode) {
                                                     dialog.errorMessage({ text: '請先設定商品條碼' });
+                                                    return
                                                 }
                                                 (window.parent as any).glitter.addMtScript(
                                                     [

package/lowcode/glitter-base/route/user.js

@@ -594,6 +594,10 @@ export class ApiUser {
         });
     }
     static setPublicConfig(cf) {
+        var _a;
+        window.glitter.share._public_config = (_a = window.glitter.share._public_config) !== null && _a !== void 0 ? _a : {};
+        const config = window.glitter.share._public_config;
+        config[cf.key + cf.user_id] = undefined;
         return BaseApi.create({
             url: getBaseUrl() + `/api-public/v1/user/public/config`,
             type: 'PUT',
@@ -635,6 +639,9 @@ export class ApiUser {
                         config[key + user_id] = res;
                         break;
                 }
+                if (key.indexOf('alt_') === 0) {
+                    config[key + user_id] = res;
+                }
                 resolve(res);
             });
         });

package/lowcode/glitter-base/route/user.ts

@@ -645,6 +645,9 @@ export class ApiUser {
     }
 
     public static setPublicConfig(cf: { key: string; value: any; user_id?: string; token?: string }) {
+        (window as any).glitter.share._public_config = (window as any).glitter.share._public_config ?? {};
+        const config = (window as any).glitter.share._public_config;
+        config[cf.key + cf.user_id]=undefined;
         return BaseApi.create({
             url: getBaseUrl() + `/api-public/v1/user/public/config`,
             type: 'PUT',
@@ -686,6 +689,9 @@ export class ApiUser {
                         config[key + user_id] = res;
                         break;
                 }
+                if(key.indexOf('alt_')===0){
+                    config[key + user_id] = res;
+                }
                 resolve(res);
             });
         });

package/lowcode/glitterBundle/Glitter.js

@@ -76,6 +76,15 @@ export class Glitter {
         this.ut = {
             glitter: this,
             queue: {},
+            resize_img_url: (link) => {
+                let rela_link = link;
+                [150, 600, 1200, 1440].reverse().map((dd) => {
+                    if (document.body.clientWidth < dd) {
+                        rela_link = link.replace('size1440_s*px$_', `size${dd}_s*px$_`);
+                    }
+                });
+                return rela_link;
+            },
             clock() {
                 return {
                     start: new Date(),
@@ -933,15 +942,15 @@ ${(!error.message) ? `` : `錯誤訊息:${error.message}`}${(!error.lineNumber)
         glitter.runJsInterFace("closeAPP", {}, function (response) {
         });
     }
-    generateCheckSum(str) {
+    generateCheckSum(str, count) {
         let hash = 0;
         for (let i = 0; i < str.length; i++) {
             hash = (hash << 5) - hash + str.charCodeAt(i);
             hash = hash & hash;
         }
         hash = Math.abs(hash);
-        let checksum = hash.toString().slice(0, 6);
-        while (checksum.length < 6) {
+        let checksum = hash.toString().slice(0, (count !== null && count !== void 0 ? count : 6));
+        while (checksum.length < (count !== null && count !== void 0 ? count : 6)) {
             checksum = '0' + checksum;
         }
         return checksum;

package/lowcode/glitterBundle/Glitter.ts

@@ -495,7 +495,7 @@ ${(!error.message) ? `` : `錯誤訊息:${error.message}`}${(!error.lineNumber)
         })
     }
 
-    public generateCheckSum(str: string) {
+    public generateCheckSum(str: string,count?:number) {
         let hash = 0;
 
         for (let i = 0; i < str.length; i++) {
@@ -507,10 +507,10 @@ ${(!error.message) ? `` : `錯誤訊息:${error.message}`}${(!error.lineNumber)
         hash = Math.abs(hash);
 
         // 將hash轉換為6碼字串
-        let checksum = hash.toString().slice(0, 6);
+        let checksum = hash.toString().slice(0, (count ?? 6));
 
         // 如果不足6碼，則補零
-        while (checksum.length < 6) {
+        while (checksum.length < (count ?? 6)) {
             checksum = '0' + checksum;
         }
 
@@ -674,6 +674,15 @@ ${(!error.message) ? `` : `錯誤訊息:${error.message}`}${(!error.lineNumber)
     public ut = {
         glitter: this,
         queue: {},
+        resize_img_url:(link:string)=>{
+            let rela_link=link;
+            [150, 600, 1200, 1440].reverse().map((dd) => {
+                if (document.body.clientWidth < dd) {
+                    rela_link = link.replace('size1440_s*px$_', `size${dd}_s*px$_`)
+                }
+            })
+            return rela_link
+        },
         clock() {
             return {
                 start: new Date(),

package/lowcode/glitterBundle/GlitterInitial.js

@@ -2,6 +2,7 @@
 import { Entry } from '../Entry.js';
 import { Glitter } from './Glitter.js';
 import { GVCType } from './module/PageManager.js';
+import { ApiUser } from "../glitter-base/route/user.js";
 const glitter = new Glitter(window);
 window.glitter = glitter;
 window.rootGlitter = glitter;
@@ -74,6 +75,27 @@ function traverseHTML(element, document) {
             traverseHTML(children[j], document);
         }
     }
+    if ((element.tagName || '').toLowerCase() === 'img') {
+        const src = element.getAttribute('src');
+        if (src) {
+            try {
+                const tag = glitter.generateCheckSum(src, 9);
+                setTimeout(() => {
+                    if (element) {
+                        ApiUser.getPublicConfig(`alt_` + tag, 'manager').then((res) => {
+                            if (res && res.response.value) {
+                                setTimeout(() => {
+                                    element.setAttribute('alt', res.response.value.alt);
+                                }, 10);
+                            }
+                        });
+                    }
+                }, 10);
+            }
+            catch (e) {
+            }
+        }
+    }
     if (element && element.getAttribute && element.getAttribute('glem') === 'bindView') {
         const id = element.getAttribute('gvc-id');
         glitter.elementCallback[id].element = element;

package/lowcode/glitterBundle/GlitterInitial.ts

@@ -3,6 +3,7 @@ import {Entry} from '../Entry.js';
 import {Glitter} from './Glitter.js';
 import {GVC} from './GVController.js';
 import {GVCType} from './module/PageManager.js';
+import {ApiUser} from "../glitter-base/route/user.js";
 
 const glitter = new Glitter(window); // glitter變數
 (window as any).glitter = glitter;
@@ -90,7 +91,28 @@ function traverseHTML(element: any, document: any) {
             traverseHTML(children[j], document);
         }
     }
+    if((element.tagName || '').toLowerCase() === 'img' ){
+        const src=element.getAttribute('src');
+        if(src){
+            try {
+                const tag=glitter.generateCheckSum(src,9)
+                setTimeout(()=>{
+                    if(element){
+                        ApiUser.getPublicConfig(`alt_`+tag,'manager').then((res)=>{
+                            if(res && res.response.value){
+                                setTimeout(()=>{
+                                    element.setAttribute('alt', res.response.value.alt);
+                                },10)
+                            }
+                        })
+                    }
+                },10)
+            }catch (e) {
 
+            }
+        }
+
+    }
     if (element && element.getAttribute && element.getAttribute('glem') === 'bindView') {
         const id = element.getAttribute('gvc-id') as string;
         glitter.elementCallback[id].element = element;

package/lowcode/glitterBundle/html-component/widget.js

@@ -131,15 +131,7 @@ export const widgetComponent = {
                                         });
                                     }
                                     if (widget.data.elem === 'img') {
-                                        let rela_link = innerText;
-                                        if (innerText.includes(`size1440_s*px$_`)) {
-                                            [150, 600, 1200, 1440].reverse().map((dd) => {
-                                                if (document.body.clientWidth < dd) {
-                                                    rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
-                                                }
-                                            });
-                                        }
-                                        option.push({ key: 'src', value: rela_link });
+                                        option.push({ key: 'src', value: gvc.glitter.ut.resize_img_url(innerText) });
                                     }
                                     else if (widget.data.elem === 'input') {
                                         option.push({ key: 'value', value: innerText });

package/lowcode/glitterBundle/html-component/widget.ts

@@ -130,18 +130,7 @@ export const widgetComponent = {
                                         })
                                     }
                                     if (widget.data.elem === 'img') {
-                                        //判斷是新版響應式連結
-                                        let rela_link = innerText
-                                        if (innerText.includes(`size1440_s*px$_`)) {
-                                            [150, 600, 1200, 1440].reverse().map((dd) => {
-                                                if (document.body.clientWidth < dd) {
-                                                    rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`)
-                                                }
-                                            })
-                                        }
-
-
-                                        option.push({key: 'src', value: rela_link})
+                                        option.push({key: 'src', value: gvc.glitter.ut.resize_img_url(innerText)})
                                     } else if (widget.data.elem === 'input') {
                                         option.push({key: 'value', value: innerText})
                                     }