w-web-perm 1.0.47 → 1.0.49

package/src/components/VeGrupBlngUsers.vue

@@ -128,34 +128,40 @@
 
                 </div>
 
-                <template v-if="items">
-                    <WAggridVue
-                        ref="rftable"
-                        :style="`width:100%;`"
-                        :height="contentHeight"
-                        :opt="opt"
-                    >
-                        <template v-slot:cell-render="props">
-                            <template v-if="props.key==='grupsNames'">
-                                <span v-for="(item, idx) in props.row.grups" :key="idx" style="display:inline-block; line-height:20px; height:20px;">
-                                    <div style="display:flex;">
-                                        <div :style="'padding:0px 5px; border-top-left-radius:4px; border-bottom-left-radius:4px; ' + (item.enable === 'y' ? 'border-left:1px solid #ac2451; border-right:1px solid #9e2149; border-top:1px solid #ac2451; border-bottom:1px solid #ac2451; background:#be295a; color:#fff;' : 'border-left:1px solid #aaaaaa; border-right:1px solid #aaaaaa; border-top:1px solid #aaaaaa; border-bottom:1px solid #aaaaaa; background:#ffffff; color:#555;')">
-                                            {{ item.mode }}
-                                        </div>
-                                        <div :style="'padding:0px 5px; border-top-right-radius:4px; border-bottom-right-radius:4px; ' + (item.enable === 'y' ? '_border-left:1px solid #ac2451; border-right:1px solid #ac2451; border-top:1px solid #ac2451; border-bottom:1px solid #ac2451; background:#d22f64; color:#fff;' : '_border-left:1px solid #aaaaaa; border-right:1px solid #aaaaaa; border-top:1px solid #aaaaaa; border-bottom:1px solid #aaaaaa; background:#eeeeee; color:#555;')">
-                                            {{ item.name }}
+                <template
+                    v-if="!firstLoading"
+                >
+
+                    <template v-if="items">
+                        <WAggridVue
+                            ref="rftable"
+                            :style="`width:100%;`"
+                            :height="contentHeight"
+                            :opt="opt"
+                        >
+                            <template v-slot:cell-render="props">
+                                <template v-if="props.key==='grupsNames'">
+                                    <span v-for="(item, idx) in props.row.grups" :key="idx" style="display:inline-block; line-height:20px; height:20px;">
+                                        <div style="display:flex;">
+                                            <div :style="'padding:0px 5px; border-top-left-radius:4px; border-bottom-left-radius:4px; ' + (item.enable === 'y' ? 'border-left:1px solid #ac2451; border-right:1px solid #9e2149; border-top:1px solid #ac2451; border-bottom:1px solid #ac2451; background:#be295a; color:#fff;' : 'border-left:1px solid #aaaaaa; border-right:1px solid #aaaaaa; border-top:1px solid #aaaaaa; border-bottom:1px solid #aaaaaa; background:#ffffff; color:#555;')">
+                                                {{ item.mode }}
+                                            </div>
+                                            <div :style="'padding:0px 5px; border-top-right-radius:4px; border-bottom-right-radius:4px; ' + (item.enable === 'y' ? '_border-left:1px solid #ac2451; border-right:1px solid #ac2451; border-top:1px solid #ac2451; border-bottom:1px solid #ac2451; background:#d22f64; color:#fff;' : '_border-left:1px solid #aaaaaa; border-right:1px solid #aaaaaa; border-top:1px solid #aaaaaa; border-bottom:1px solid #aaaaaa; background:#eeeeee; color:#555;')">
+                                                {{ item.name }}
+                                            </div>
                                         </div>
-                                    </div>
-                                </span>
+                                    </span>
+                                </template>
+                                <select v-else-if="props.key==='mode'" @change="showVeGrupBlngUsersToggleItemModeByName(props.row.name, $event.target.value)" :disabled="!isEditable">
+                                    <option value="OR" :selected="props.row.mode === 'OR'">OR</option>
+                                    <option value="AND" :selected="props.row.mode === 'AND'">AND</option>
+                                </select>
+                                <input v-else-if="props.key==='enable'" type="checkbox" :checked="props.value === 'y'" @click="showVeGrupBlngUsersToggleItemEnableByName(props.row.name)" :disabled="!isEditable" />
+                                <span v-else>{{ props.value }}</span>
                             </template>
-                            <select v-else-if="props.key==='mode'" @change="showVeGrupBlngUsersToggleItemModeByName(props.row.name, $event.target.value)" :disabled="!isEditable">
-                                <option value="OR" :selected="props.row.mode === 'OR'">OR</option>
-                                <option value="AND" :selected="props.row.mode === 'AND'">AND</option>
-                            </select>
-                            <input v-else-if="props.key==='enable'" type="checkbox" :checked="props.value === 'y'" @click="showVeGrupBlngUsersToggleItemEnableByName(props.row.name)" :disabled="!isEditable" />
-                            <span v-else>{{ props.value }}</span>
-                        </template>
-                    </WAggridVue>
+                        </WAggridVue>
+                    </template>
+
                 </template>
 
                 <div
@@ -223,6 +229,8 @@ export default {
             panelHeight: 100,
             headHeight: 100,
 
+            firstLoading: true,
+            firstSetting: true,
             isEditable: false,
             isModified: false,
 
@@ -244,9 +252,26 @@ export default {
         Vue.prototype.$dg.showVeGrupBlngUsersToggleItemModeByName = vo.showVeGrupBlngUsersToggleItemModeByName
         Vue.prototype.$dg.showVeGrupBlngUsersToggleItemEnableByName = vo.showVeGrupBlngUsersToggleItemEnableByName
 
+        //firstSetting
+        if (vo.firstSetting) {
+            // console.log('webInfor', vo.webInfor)
+
+            //會觸發數據變更再導致opt變更導致觸發rowsChange等事件, 故得要延遲, 供組件偵測初始設定數據初始化之用
+            setTimeout(() => {
+                vo.firstSetting = false
+                // console.log('firstSetting', vo.firstSetting)
+            }, 1)
+
+        }
+
     },
     computed: {
 
+        syncState: function() {
+            let vo = this
+            return get(vo, '$store.state.syncState')
+        },
+
         targets: function() {
             let rs = get(this, `$store.state.targets`)
             rs = sortBy(rs, 'order')
@@ -434,6 +459,11 @@ export default {
                         // console.log('rowsChange', rs)
                         // console.log('rowsChange cloneDeep(vo.opt.rows)', cloneDeep(vo.opt.rows))
 
+                        //check
+                        if (!vo.syncState || vo.firstLoading || vo.firstSetting) {
+                            return
+                        }
+
                         //isModified
                         vo.isModified = true
 
@@ -935,7 +965,8 @@ export default {
 
             //check
             if (size(rows) === 0) {
-                vo.$alert(`${vo.$t('userSaveUsersEmpty')}`, { type: 'error' })
+                vo.$ui.updateLoading(false) //showCheckYes 前關 loading（modal 阻斷、避免 clickSave 包裝層 loading 疊在 modal 後）
+                await vo.$dg.showCheckYes(`${vo.$t('userSaveUsersEmpty')}`)
                 return
             }
 
@@ -947,12 +978,14 @@ export default {
 
             //check
             if (errTemp !== null) {
-                vo.$alert(`${vo.$t('userSaveUsersFail')}: ${errTemp}`, { type: 'error' })
+                vo.$ui.updateLoading(false)
+                await vo.$dg.showCheckYes(`${vo.$t('userSaveUsersFail')}: ${vo.$tErr(errTemp)}`)
                 return
             }
 
             //alert
-            vo.$alert(vo.$t('userSaveUsersSuccess'))
+            vo.$ui.updateLoading(false)
+            await vo.$dg.showCheckYes(vo.$t('userSaveUsersSuccess'), { type: 'success' })
 
         },
 
@@ -976,6 +1009,18 @@ export default {
 
             let vo = this
 
+            //save按鈕第一行立刻釋放視覺鎖
+            msg.pm.resolve()
+
+            //fire-and-forget, 不 await
+            vo.doSave()
+
+        },
+
+        doSave: function() {
+
+            let vo = this
+
             async function core() {
 
                 //show loading
@@ -1057,9 +1102,6 @@ export default {
                 .catch(() => { })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 
@@ -1112,6 +1154,9 @@ export default {
             //genOpt
             vo.genOpt()
 
+            //firstLoading
+            vo.firstLoading = false
+
             //bShow
             vo.bShow = true
 

package/src/components/VePemiBlngGrups.vue

@@ -128,34 +128,40 @@
 
                 </div>
 
-                <template v-if="items">
-                    <WAggridVue
-                        ref="rftable"
-                        :style="`width:100%;`"
-                        :height="contentHeight"
-                        :opt="opt"
-                    >
-                        <template v-slot:cell-render="props">
-                            <template v-if="props.key==='pemisNames'">
-                                <span v-for="(item, idx) in props.row.pemis" :key="idx" style="display:inline-block; line-height:20px; height:20px;">
-                                    <div style="display:flex;">
-                                        <div :style="'padding:0px 5px; border-top-left-radius:4px; border-bottom-left-radius:4px; ' + (item.enable === 'y' ? 'border-left:1px solid #ac2451; border-right:1px solid #9e2149; border-top:1px solid #ac2451; border-bottom:1px solid #ac2451; background:#be295a; color:#fff;' : 'border-left:1px solid #aaaaaa; border-right:1px solid #aaaaaa; border-top:1px solid #aaaaaa; border-bottom:1px solid #aaaaaa; background:#ffffff; color:#555;')">
-                                            {{ item.mode }}
-                                        </div>
-                                        <div :style="'padding:0px 5px; border-top-right-radius:4px; border-bottom-right-radius:4px; ' + (item.enable === 'y' ? '_border-left:1px solid #ac2451; border-right:1px solid #ac2451; border-top:1px solid #ac2451; border-bottom:1px solid #ac2451; background:#d22f64; color:#fff;' : '_border-left:1px solid #aaaaaa; border-right:1px solid #aaaaaa; border-top:1px solid #aaaaaa; border-bottom:1px solid #aaaaaa; background:#eeeeee; color:#555;')">
-                                            {{ item.name }}
+                <template
+                    v-if="!firstLoading"
+                >
+
+                    <template v-if="items">
+                        <WAggridVue
+                            ref="rftable"
+                            :style="`width:100%;`"
+                            :height="contentHeight"
+                            :opt="opt"
+                        >
+                            <template v-slot:cell-render="props">
+                                <template v-if="props.key==='pemisNames'">
+                                    <span v-for="(item, idx) in props.row.pemis" :key="idx" style="display:inline-block; line-height:20px; height:20px;">
+                                        <div style="display:flex;">
+                                            <div :style="'padding:0px 5px; border-top-left-radius:4px; border-bottom-left-radius:4px; ' + (item.enable === 'y' ? 'border-left:1px solid #ac2451; border-right:1px solid #9e2149; border-top:1px solid #ac2451; border-bottom:1px solid #ac2451; background:#be295a; color:#fff;' : 'border-left:1px solid #aaaaaa; border-right:1px solid #aaaaaa; border-top:1px solid #aaaaaa; border-bottom:1px solid #aaaaaa; background:#ffffff; color:#555;')">
+                                                {{ item.mode }}
+                                            </div>
+                                            <div :style="'padding:0px 5px; border-top-right-radius:4px; border-bottom-right-radius:4px; ' + (item.enable === 'y' ? '_border-left:1px solid #ac2451; border-right:1px solid #ac2451; border-top:1px solid #ac2451; border-bottom:1px solid #ac2451; background:#d22f64; color:#fff;' : '_border-left:1px solid #aaaaaa; border-right:1px solid #aaaaaa; border-top:1px solid #aaaaaa; border-bottom:1px solid #aaaaaa; background:#eeeeee; color:#555;')">
+                                                {{ item.name }}
+                                            </div>
                                         </div>
-                                    </div>
-                                </span>
+                                    </span>
+                                </template>
+                                <select v-else-if="props.key==='mode'" @change="showVePemiBlngGrupsToggleItemModeByName(props.row.name, $event.target.value)" :disabled="!isEditable">
+                                    <option value="OR" :selected="props.row.mode === 'OR'">OR</option>
+                                    <option value="AND" :selected="props.row.mode === 'AND'">AND</option>
+                                </select>
+                                <input v-else-if="props.key==='enable'" type="checkbox" :checked="props.value === 'y'" @click="showVePemiBlngGrupsToggleItemEnableByName(props.row.name)" :disabled="!isEditable" />
+                                <span v-else>{{ props.value }}</span>
                             </template>
-                            <select v-else-if="props.key==='mode'" @change="showVePemiBlngGrupsToggleItemModeByName(props.row.name, $event.target.value)" :disabled="!isEditable">
-                                <option value="OR" :selected="props.row.mode === 'OR'">OR</option>
-                                <option value="AND" :selected="props.row.mode === 'AND'">AND</option>
-                            </select>
-                            <input v-else-if="props.key==='enable'" type="checkbox" :checked="props.value === 'y'" @click="showVePemiBlngGrupsToggleItemEnableByName(props.row.name)" :disabled="!isEditable" />
-                            <span v-else>{{ props.value }}</span>
-                        </template>
-                    </WAggridVue>
+                        </WAggridVue>
+                    </template>
+
                 </template>
 
                 <div
@@ -223,6 +229,8 @@ export default {
             panelHeight: 100,
             headHeight: 100,
 
+            firstLoading: true,
+            firstSetting: true,
             isEditable: false,
             isModified: false,
 
@@ -244,9 +252,26 @@ export default {
         Vue.prototype.$dg.showVePemiBlngGrupsToggleItemModeByName = vo.showVePemiBlngGrupsToggleItemModeByName
         Vue.prototype.$dg.showVePemiBlngGrupsToggleItemEnableByName = vo.showVePemiBlngGrupsToggleItemEnableByName
 
+        //firstSetting
+        if (vo.firstSetting) {
+            // console.log('webInfor', vo.webInfor)
+
+            //會觸發數據變更再導致opt變更導致觸發rowsChange等事件, 故得要延遲, 供組件偵測初始設定數據初始化之用
+            setTimeout(() => {
+                vo.firstSetting = false
+                // console.log('firstSetting', vo.firstSetting)
+            }, 1)
+
+        }
+
     },
     computed: {
 
+        syncState: function() {
+            let vo = this
+            return get(vo, '$store.state.syncState')
+        },
+
         targets: function() {
             let rs = get(this, `$store.state.targets`)
             rs = sortBy(rs, 'order')
@@ -434,6 +459,11 @@ export default {
                         // console.log('rowsChange', rs)
                         // console.log('rowsChange cloneDeep(vo.opt.rows)', cloneDeep(vo.opt.rows))
 
+                        //check
+                        if (!vo.syncState || vo.firstLoading || vo.firstSetting) {
+                            return
+                        }
+
                         //isModified
                         vo.isModified = true
 
@@ -935,7 +965,8 @@ export default {
 
             //check
             if (size(rows) === 0) {
-                vo.$alert(`${vo.$t('grupSaveGrupsEmpty')}`, { type: 'error' })
+                vo.$ui.updateLoading(false) //showCheckYes 前關 loading（modal 阻斷、避免 clickSave 包裝層 loading 疊在 modal 後）
+                await vo.$dg.showCheckYes(`${vo.$t('grupSaveGrupsEmpty')}`)
                 return
             }
 
@@ -947,12 +978,14 @@ export default {
 
             //check
             if (errTemp !== null) {
-                vo.$alert(`${vo.$t('grupSaveGrupsFail')}: ${errTemp}`, { type: 'error' })
+                vo.$ui.updateLoading(false)
+                await vo.$dg.showCheckYes(`${vo.$t('grupSaveGrupsFail')}: ${vo.$tErr(errTemp)}`)
                 return
             }
 
             //alert
-            vo.$alert(vo.$t('grupSaveGrupsSuccess'))
+            vo.$ui.updateLoading(false)
+            await vo.$dg.showCheckYes(vo.$t('grupSaveGrupsSuccess'), { type: 'success' })
 
         },
 
@@ -976,6 +1009,18 @@ export default {
 
             let vo = this
 
+            //save按鈕第一行立刻釋放視覺鎖
+            msg.pm.resolve()
+
+            //fire-and-forget, 不 await
+            vo.doSave()
+
+        },
+
+        doSave: function() {
+
+            let vo = this
+
             async function core() {
 
                 //show loading
@@ -1057,9 +1102,6 @@ export default {
                 .catch(() => { })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 
@@ -1112,6 +1154,9 @@ export default {
             //genOpt
             vo.genOpt()
 
+            //firstLoading
+            vo.firstLoading = false
+
             //bShow
             vo.bShow = true
 

package/src/getPerm.mjs

@@ -12,10 +12,10 @@ async function getPerm(url, tokenTar, opt = {}) {
 
     //check
     if (!isestr(url)) {
-        return Promise.reject('invalid url')
+        return Promise.reject('invalidUrl')
     }
     if (!isestr(tokenTar)) {
-        return Promise.reject('invalid tokenTar')
+        return Promise.reject('invalidTokenTar')
     }
 
     //funConvertPerm
@@ -23,7 +23,7 @@ async function getPerm(url, tokenTar, opt = {}) {
 
     //url
     if (url.indexOf('token={token}') < 0) {
-        return Promise.reject(`no 'token={token}' in url`)
+        return Promise.reject('noTokenInUrl')
     }
     url = url.replaceAll('{token}', tokenTar)
     // console.log('getPerm: url', url)
@@ -36,10 +36,7 @@ async function getPerm(url, tokenTar, opt = {}) {
 
     //check
     if (errTemp !== null) {
-        console.log('res', res)
-        console.log('errTemp', errTemp)
-        console.log(`can not get user by url[${url}]`)
-        return Promise.reject(`can not get user by url[${url}]`) //由SSO取得使用者資訊錯誤
+        return Promise.reject('cannotGetUserByUrl') //由SSO取得使用者資訊錯誤
     }
 
     //data
@@ -53,12 +50,7 @@ async function getPerm(url, tokenTar, opt = {}) {
 
     //check
     if (state !== 'success') {
-        console.log('res', res)
-        console.log('data', data)
-        console.log('state', state)
-        console.log('errTemp', msg)
-        console.log(`can not get user data by url[${url}]`)
-        return Promise.reject(`can not get user data by url[${url}]`) //取得使用者資訊失敗
+        return Promise.reject('cannotGetUserDataByUrl') //取得使用者資訊失敗
     }
 
     //ur
@@ -67,8 +59,7 @@ async function getPerm(url, tokenTar, opt = {}) {
 
     //check
     if (!iseobj(ur)) {
-        console.log(`no user data by url[${url}]`)
-        return Promise.reject(`no user data by url[${url}]`)
+        return Promise.reject('noUserDataByUrl')
     }
 
     //check
@@ -83,8 +74,7 @@ async function getPerm(url, tokenTar, opt = {}) {
 
         //check
         if (!iseobj(ur)) {
-            console.log(`no user data after funConvertPerm`)
-            return Promise.reject(`no user data after funConvertPerm`)
+            return Promise.reject('noUserDataAfterConvert')
         }
 
     }

package/src/getPermUserInfor.mjs

@@ -12,13 +12,13 @@ async function getPermUserInfor(url, tokenSelf, userIdTar, opt = {}) {
 
     //check
     if (!isestr(url)) {
-        return Promise.reject('invalid url')
+        return Promise.reject('invalidUrl')
     }
     if (!isestr(tokenSelf)) {
-        return Promise.reject('invalid tokenSelf')
+        return Promise.reject('invalidTokenSelf')
     }
     if (!isestr(userIdTar)) {
-        return Promise.reject('invalid userIdTar')
+        return Promise.reject('invalidUserIdTar')
     }
 
     //funConvertPerm
@@ -26,7 +26,7 @@ async function getPermUserInfor(url, tokenSelf, userIdTar, opt = {}) {
 
     //url
     if (url.indexOf('token={sysToken}') < 0 && url.indexOf('userId={userId}') < 0) {
-        return Promise.reject(`no 'token={sysToken}', 'userId={userId}' in url`)
+        return Promise.reject('noTokenUserIdInUrl')
     }
     url = url.replaceAll('{sysToken}', tokenSelf) //系統介接用permToken
     url = url.replaceAll('{userId}', userIdTar)
@@ -40,10 +40,7 @@ async function getPermUserInfor(url, tokenSelf, userIdTar, opt = {}) {
 
     //check
     if (errTemp !== null) {
-        console.log('res', res)
-        console.log('errTemp', errTemp)
-        console.log(`can not get user by url[${url}]`)
-        return Promise.reject(`can not get user by url[${url}]`) //由SSO取得使用者資訊錯誤
+        return Promise.reject('cannotGetUserByUrl') //由SSO取得使用者資訊錯誤
     }
 
     //data
@@ -57,12 +54,7 @@ async function getPermUserInfor(url, tokenSelf, userIdTar, opt = {}) {
 
     //check
     if (state !== 'success') {
-        console.log('res', res)
-        console.log('data', data)
-        console.log('state', state)
-        console.log('errTemp', msg)
-        console.log(`can not get user data by url[${url}]`)
-        return Promise.reject(`can not get user data by url[${url}]`) //取得使用者資訊失敗
+        return Promise.reject('cannotGetUserDataByUrl') //取得使用者資訊失敗
     }
 
     //ur
@@ -71,8 +63,7 @@ async function getPermUserInfor(url, tokenSelf, userIdTar, opt = {}) {
 
     //check
     if (!iseobj(ur)) {
-        console.log(`no user data by url[${url}]`)
-        return Promise.reject(`no user data by url[${url}]`)
+        return Promise.reject('noUserDataByUrl')
     }
 
     //check
@@ -87,8 +78,7 @@ async function getPermUserInfor(url, tokenSelf, userIdTar, opt = {}) {
 
         //check
         if (!iseobj(ur)) {
-            console.log(`no user data after funConvertPerm`)
-            return Promise.reject(`no user data after funConvertPerm`)
+            return Promise.reject('noUserDataAfterConvert')
         }
 
     }

package/src/main.js

@@ -32,6 +32,7 @@ let dssm = mDataSelectorSchema(ds)
 //prototype
 Vue.prototype.$ui = ui
 Vue.prototype.$t = ui.getKpText
+Vue.prototype.$tErr = ui.tErr
 Vue.prototype.$s = s
 Vue.prototype.$dssm = dssm
 Vue.prototype.$ds = ds

package/src/plugins/mShare.mjs

@@ -479,25 +479,20 @@ function getUserRules(user, grups, pemis, targets) {
     }
     // console.log('merge _rules', cloneDeep(_rules))
 
-    //expand _rules
+    //expand _rules：以「當前 targets」為輸出主軸——逐 target 取其解析後 isActive（取自合併 crules 的 kp、預設 'n'）。
+    //如此只列現存管控對象；crules 仍引用但已從 targets 刪除的「孤兒 target」自然被濾掉，不再殘留於權限樹。
+    //（修正前：輸出 kp 全部 keys = crules keys ∪ targets，導致已刪 target 因 crules 殘留引用而仍出現在權限樹。）
     if (true) {
         let kp = {}
         each(_rules, (v) => {
             kp[v.name] = v.isActive
         })
-        each(targets, (t) => {
-            // console.log('t', t)
-            if (!haskey(kp, t.id)) {
-                kp[t.id] = 'n'
-            }
-        })
         let rs = []
-        each(kp, (v, k) => {
-            let r = {
-                name: k,
-                isActive: v,
-            }
-            rs.push(r)
+        each(targets, (t) => {
+            rs.push({
+                name: t.id,
+                isActive: get(kp, t.id, 'n'),
+            })
         })
         _rules = rs
     }

package/src/plugins/mUI.mjs

@@ -150,10 +150,9 @@ function getLang() {
         }
     }
 
-    //return
-    if (!isestr(lang)) {
-        return 'eng'
-    }
+    //validLang
+    lang = validLang(lang) //有可能給予非預期lang
+
     return lang
 }
 
@@ -165,9 +164,7 @@ function setLang(lang = null, from = '') {
     if (!isestr(lang)) {
         lang = getLang()
     }
-    else {
-        lang = validLang(lang)
-    }
+    lang = validLang(lang)
     // console.log('get lang', lang)
 
     //check, 若有變更才commit
@@ -218,6 +215,16 @@ function getKpText(key) {
 }
 
 
+function tErr(err) {
+    let key = isestr(err) ? err : 'anUnexpectedErrorOccurred'
+    let msg = getKpText(key)           //後端 err key → 翻譯
+    if (msg === key) {                 //getKpText 查無 → 回傳 key 本身 → 非 procLang key (連線層 raw 等)
+        msg = getKpText('cannotConnectServer')
+    }
+    return msg
+}
+
+
 function gv(o, k, cv = null) {
     let r = get(o, k, '')
     if (!isestr(r)) {
@@ -293,6 +300,7 @@ let mUI = {
 
     setLang,
     getKpText,
+    tErr,
 
     gv,
     syncHeight,

package/src/store/mutations.mjs

@@ -26,7 +26,7 @@ let state = {
     userToken: '',
     userSelf: {},
 
-    lang: 'cht', //'eng', 'cht'
+    lang: 'eng', //'eng', 'cht'
     kpText: {}, //一定要放在vuex內, 否則無法用broadcast驅動變更語系文字
 
 }