w-web-perm 1.0.45 → 1.0.47

package/src/plugins/mUI.mjs

@@ -22,7 +22,6 @@ import delay from 'wsemi/src/delay.mjs'
 import isarr from 'wsemi/src/isarr.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
-import iseobj from 'wsemi/src/iseobj.mjs'
 import isearr from 'wsemi/src/isearr.mjs'
 import isEle from 'wsemi/src/isEle.mjs'
 import strleft from 'wsemi/src/strleft.mjs'
@@ -42,12 +41,36 @@ import replace from 'wsemi/src/replace.mjs'
 import timemsTZ2past from 'wsemi/src/timemsTZ2past.mjs'
 import convertToTree from 'wsemi/src/convertToTree.mjs'
 // import WUiDwload from 'w-ui-dwload/src/WUiDwload.mjs'
-import kpLang from './mLang.mjs'
 
 
 let vo = Vue.prototype
 
 
+//連線建立前的 fallback 專用, 僅含連線狀態字串, 其餘語系皆由後端提供
+let kpFallback = {
+    csIng: {
+        eng: 'Connecting...',
+        cht: '連線中...',
+    },
+    csLogin: {
+        eng: 'Logged in',
+        cht: '已登入',
+    },
+    csLogout: {
+        eng: 'Logged out',
+        cht: '已登出',
+    },
+    csErrConn: {
+        eng: 'Unable to connect',
+        cht: '無法連線',
+    },
+    csErrLogin: {
+        eng: 'Login denied',
+        cht: '拒絕登入',
+    },
+}
+
+
 function setVo(vObj) {
     vo = vObj
 }
@@ -156,73 +179,20 @@ function setLang(lang = null, from = '') {
         }
     }
 
-    //genKpText, 切換lang得調用getKpLang重算kpText
-    genKpText(lang)
-
-    //forceUpdate
-    forceUpdate()
-
-}
-
-
-function genKpText(lang) {
-    // console.log('genKpText', lang)
-
-    //kp
-    let kp = {}
-
     //kpLang
-    kp = {
-        ...kp,
-        ...kpLang,
-    }
-
-    //kpLangExt
-    let kpLangExt = get(vo, '$store.state.webInfor.kpLangExt', {})
-    // console.log('kpLangExt', kpLangExt)
-    if (iseobj(kpLangExt)) {
-        kp = {
-            ...kp,
-            ...kpLangExt,
-        }
-    }
-
-    //webName
-    let webName = get(vo, '$store.state.webInfor.webName', {})
-    // console.log('webName', webName)
-    if (iseobj(webName)) {
-        kp = {
-            ...kp,
-            webName: {
-                ...webName,
-            },
-        }
-    }
-
-    //webDescription
-    let webDescription = get(vo, '$store.state.webInfor.webDescription', {})
-    // console.log('webDescription', webDescription)
-    if (iseobj(webDescription)) {
-        kp = {
-            ...kp,
-            webDescription: {
-                ...webDescription,
-            },
-        }
-    }
+    let kpLang = get(vo, '$store.state.webInfor.kpLang', {})
 
     //kpText
-    let kpText = {}
-    each(kp, (v, k) => {
-        kpText[k] = v[lang]
-    })
-    // console.log('kp', kp)
+    let kpText = get(kpLang, lang, {})
     // console.log('kpText', kpText)
 
     //commit
     vo.$store.commit(vo.$store.types.UpdateKpText, kpText)
     // console.log('commit kpText', kpText)
 
+    //forceUpdate
+    forceUpdate()
+
 }
 
 
@@ -235,6 +205,11 @@ function getKpText(key) {
 
     //t
     let t = get(kpText, key, '')
+    if (!isestr(t)) {
+        // fallback: 後端語系尚未載入時使用預設值
+        let lang = getLang()
+        t = get(kpFallback, `${key}.${lang}`, '')
+    }
     if (!isestr(t)) {
         t = key
     }

package/src/schema/tables/users.mjs

@@ -127,9 +127,9 @@ let funTest = () => {
             isAdmin,
         })
         v.id = `id-for-${name}`
-        if (name === 'john') {
-            v.email = `${v.email};john@test.com`
-        }
+        // if (name === 'john') {
+        //     v.email = `${v.email};john@test.com`
+        // }
         v.isAdmin = isAdmin
         v = dtpick(v, keys(settings))
         return v

package/tableTags.json

@@ -1 +1 @@
-{"grups":"2025-07-24T23:53:43+08:00|kqQUfj","pemis":"2025-07-24T23:53:43+08:00|JIx6QG","targets":"2025-07-24T23:53:43+08:00|DLziCS","users":"2025-07-24T23:53:43+08:00|qBeZwW"}
+{"grups":"2026-03-26T16:16:47+08:00|OgUEFl","pemis":"2026-03-26T16:16:47+08:00|ZQqITs","targets":"2026-03-26T16:16:47+08:00|c3veRF","users":"2026-03-26T16:16:47+08:00|pCsk2f"}