w-web-perm 1.0.44 → 1.0.46

package/docs/WWebPerm.html

@@ -80,7 +80,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WWebPerm.mjs.html">WWebPerm.mjs</a>, <a href="WWebPerm.mjs.html#line137">line 137</a>
+        <a href="WWebPerm.mjs.html">WWebPerm.mjs</a>, <a href="WWebPerm.mjs.html#line138">line 138</a>
     </li></ul></dd>
     
 
@@ -925,7 +925,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Wed Nov 26 2025 22:41:34 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Thu Mar 26 2026 15:32:00 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebPerm.mjs.html

@@ -78,6 +78,7 @@ import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
 import ds from '../src/schema/index.mjs'
 import { getUserRules } from '../src/plugins/mShare.mjs'
+import procLang from './procLang.mjs'
 
 
 /**
@@ -310,6 +311,10 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
     let kpLangExt = get(opt, 'kpLangExt', null)
 
 
+    //kpLang
+    let kpLang = procLang({ kpLangExt, webName, webDescription })
+
+
     //WServOrm
     let optWServOrm = {
         useCheckUser,
@@ -330,13 +335,14 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
     let getWebInfor = (userId) => {
         return {
 
-            webName,
-            webDescription,
+            // webName, //已併入kpLang
+            // webDescription, //已併入kpLang
             webLogo,
             // urlRedirect, //登入失敗就需要轉址, 故須通過html模板取代提供, 無法用api提供
 
             showLanguage,
             language,
+            kpLang,
 
             showModeEditTargets,
             showModeEditPemis,
@@ -357,8 +363,6 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
             widthUsersEmail,
             widthUsersDescription,
 
-            kpLangExt,
-
         }
     }
 
@@ -1272,7 +1276,7 @@ export default WWebPerm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Wed Nov 26 2025 22:41:34 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Thu Mar 26 2026 15:32:00 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Wed Nov 26 2025 22:41:34 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Thu Mar 26 2026 15:32:00 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g.initialData.mjs

@@ -188,9 +188,9 @@ async function initialData() {
             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 //funNew會複寫isAdmin為n, 得另外重置
         return v
     })

package/g.provideUsers.mjs

@@ -57,9 +57,9 @@ async function provide() {
             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
         return v
     })

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "w-web-perm",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",
-    "axios": "^1.9.0",
+    "axios": "^1.13.6",
     "json5": "^2.2.3",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "showdown": "^2.1.0",
-    "w-component-vue": "^2.4.36",
+    "w-aggrid-vue": "^2.0.57",
+    "w-component-vue": "^2.4.44",
     "w-data-collector": "^1.0.22",
-    "w-serv-hapi": "^1.0.71",
-    "w-serv-orm": "^1.0.37",
+    "w-serv-hapi": "^1.0.72",
+    "w-serv-orm": "^1.0.38",
     "w-ui-loginout": "^1.0.10",
-    "wsemi": "^1.8.34"
+    "wsemi": "^1.8.43"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
@@ -30,7 +31,7 @@
     "vue": "^2.6.14",
     "vuex": "^3.6.2",
     "w-orm-lmdb": "^1.0.3",
-    "w-package-tools": "^1.1.2"
+    "w-package-tools": "^1.1.3"
   },
   "scripts": {
     "serve": "vue-cli-service serve",

package/server/WWebPerm.mjs

@@ -31,6 +31,7 @@ import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
 import ds from '../src/schema/index.mjs'
 import { getUserRules } from '../src/plugins/mShare.mjs'
+import procLang from './procLang.mjs'
 
 
 /**
@@ -263,6 +264,10 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
     let kpLangExt = get(opt, 'kpLangExt', null)
 
 
+    //kpLang
+    let kpLang = procLang({ kpLangExt, webName, webDescription })
+
+
     //WServOrm
     let optWServOrm = {
         useCheckUser,
@@ -283,13 +288,14 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
     let getWebInfor = (userId) => {
         return {
 
-            webName,
-            webDescription,
+            // webName, //已併入kpLang
+            // webDescription, //已併入kpLang
             webLogo,
             // urlRedirect, //登入失敗就需要轉址, 故須通過html模板取代提供, 無法用api提供
 
             showLanguage,
             language,
+            kpLang,
 
             showModeEditTargets,
             showModeEditPemis,
@@ -310,8 +316,6 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
             widthUsersEmail,
             widthUsersDescription,
 
-            kpLangExt,
-
         }
     }