w-web-perm 1.0.48 → 1.0.50

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

@@ -2,13 +2,10 @@ import Vue from 'vue'
 import get from 'lodash-es/get.js'
 import WServHapiClient from 'w-serv-hapi/src/WServHapiClient.mjs'
 import WAlert from 'w-component-vue/src/components/WAlert.mjs'
-import domMutation from 'w-component-vue/src/js/domMutation.mjs'
 import domResize from 'w-component-vue/src/js/domResize.mjs'
-import domDragDrop from 'w-component-vue/src/js/domDragDrop.mjs'
 import App from './App.vue'
 import store from './store/index.mjs'
 import ui from './plugins/mUI.mjs'
-import mDataSelectorSchema from './plugins/mDataSelectorSchema.mjs'
 import * as s from './plugins/mShare.mjs'
 import ds from './schema/index.mjs'
 // console.log('ds', ds)
@@ -26,21 +23,16 @@ Vue.prototype.$alert = function() {
     }
 }
 
-//dssm
-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
 Vue.prototype.$dg = {}
 
 //directive
 Vue.directive('domresize', domResize())
-Vue.directive('dommutation', domMutation())
-Vue.directive('domdragdrop', domDragDrop())
 
 //WServHapiClient
 // let bFirstSync = false //不需要bFirstSync, 由getWebInfor結束代表第1次完成同步
@@ -75,6 +67,9 @@ WServHapiClient({
             })
             .catch((err) => {
                 console.log(err)
+                //getWebInfor 失敗時, connState 已為 csLogin 但 webInfor 為空 → ready 永遠為 false 會永久卡「已登入」轉圈畫面.
+                //改落到 csErrConn, 讓 LayoutState 顯示「無法連線」狀態畫面 (使用者可見錯誤而非靜默卡死).
+                ui.updateConnState('csErrConn')
             })
 
     },

package/src/perm.mjs

@@ -23,12 +23,11 @@ function perm() {
         if (!isestr(url)) {
             throw new Error(`invalid url`)
         }
-        if (url.indexOf('token=') === 0) {
+        if (url.indexOf('token=') < 0) {
             throw new Error(`url does not include 'token='`)
         }
-        if (url.indexOf('userId=') === 0) {
-            throw new Error(`url does not include 'userId='`)
-        }
+        //註: conn() 為通用連線, getPerm 之 url 僅含 token=、getPermUserInfor 才含 userId=,
+        //故此處不強制 userId=（端點專屬之 userId 驗證由後端對應 handler 負責）。
 
         //permSuccess
         let permSuccess = get(opt, 'permSuccess')

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

@@ -1,45 +1,11 @@
 import Vue from 'vue'
-import min from 'lodash-es/min.js'
-import size from 'lodash-es/size.js'
-import take from 'lodash-es/take.js'
-import isEqual from 'lodash-es/isEqual.js'
-import uniq from 'lodash-es/uniq.js'
-import set from 'lodash-es/set.js'
 import get from 'lodash-es/get.js'
 import each from 'lodash-es/each.js'
-import map from 'lodash-es/map.js'
-import filter from 'lodash-es/filter.js'
-import last from 'lodash-es/last.js'
-import split from 'lodash-es/split.js'
-import join from 'lodash-es/join.js'
-import drop from 'lodash-es/drop.js'
-import dropRight from 'lodash-es/dropRight.js'
-import groupBy from 'lodash-es/groupBy.js'
-import sortBy from 'lodash-es/sortBy.js'
 import cloneDeep from 'lodash-es/cloneDeep.js'
-import cint from 'wsemi/src/cint.mjs'
 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 isearr from 'wsemi/src/isearr.mjs'
-import isEle from 'wsemi/src/isEle.mjs'
-import strleft from 'wsemi/src/strleft.mjs'
-import strdelleft from 'wsemi/src/strdelleft.mjs'
-import sep from 'wsemi/src/sep.mjs'
-import aes2str from 'wsemi/src/aes2str.mjs'
-import str2aes from 'wsemi/src/str2aes.mjs'
-import haskey from 'wsemi/src/haskey.mjs'
-import genPm from 'wsemi/src/genPm.mjs'
-import pmSeries from 'wsemi/src/pmSeries.mjs'
 import waitFun from 'wsemi/src/waitFun.mjs'
-import browserView from 'wsemi/src/browserView.mjs'
-import arrHas from 'wsemi/src/arrHas.mjs'
-import arrSort from 'wsemi/src/arrSort.mjs'
-import arrInsert from 'wsemi/src/arrInsert.mjs'
-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'
 
 
@@ -215,16 +181,13 @@ function getKpText(key) {
 }
 
 
-function gv(o, k, cv = null) {
-    let r = get(o, k, '')
-    if (!isestr(r)) {
-        let def = getKpText('empty')
-        return def
+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')
     }
-    if (isfun(cv)) {
-        r = cv(r)
-    }
-    return r
+    return msg
 }
 
 
@@ -290,8 +253,8 @@ let mUI = {
 
     setLang,
     getKpText,
+    tErr,
 
-    gv,
     syncHeight,
 
     // waitData,

package/src/store/mutations.mjs

@@ -74,12 +74,6 @@ export let mutations = {
         state[msg.tableName] = msg.data
     },
 
-    [types.UpdateData] (state, msg) {
-        //msg.path內為存取路徑, 需使用set處理
-        // console.log('UpdateData msg', msg)
-        set(state, msg.path, msg.data)
-    },
-
     [types.UpdateHeightApp] (state, heightApp) {
         state.heightApp = heightApp
     },
@@ -92,10 +86,6 @@ export let mutations = {
         state.heightToolbar = heightToolbar
     },
 
-    [types.UpdateMenu] (state, menu) {
-        state.menu = menu
-    },
-
     [types.UpdateUserToken] (state, userToken) {
         state.userToken = userToken
     },

package/src/store/types.mjs

@@ -6,10 +6,8 @@ export const UpdateSyncState = 'UpdateSyncState'
 export const UpdateLoading = 'UpdateLoading'
 // export const UpdateViewState = 'UpdateViewState'
 export const UpdateTableData = 'UpdateTableData'
-export const UpdateData = 'UpdateData'
 export const UpdateHeightApp = 'UpdateHeightApp'
 export const UpdateHeightAppEff = 'UpdateHeightAppEff'
 export const UpdateHeightToolbar = 'UpdateHeightToolbar'
-export const UpdateMenu = 'UpdateMenu'
 export const UpdateUserToken = 'UpdateUserToken'
 export const UpdateUserSelf = 'UpdateUserSelf'

package/srv.mjs

@@ -1,101 +1,76 @@
-import WOrm from 'w-orm-lmdb/src/WOrmLmdb.mjs'
-import WWebPerm from './server/WWebPerm.mjs'
-import getSettings from './g.getSettings.mjs'
-
-
-//st
-let st = getSettings()
-
-let url = st.dbUrl
-let db = st.dbName
-let opt = {
-
-    useCheckUser: false,
-    getUserById: null,
-    useExcludeWhenNotAdmin: false,
-
-    serverPort: 11006,
-    subfolder: '', //mperm
-    urlRedirect: 'https://www.google.com/', //本機測試時得先編譯, 再瀏覽: http://localhost:11006/
-
-    showLanguage: 'y', //'n',
-    language: 'eng', //'eng', 'cht'
-
-    showModeEditTargets: 'y', //'n',
-    showModeEditPemis: 'y',
-    showModeEditGrups: 'y',
-    showModeEditUsers: 'y',
-    modeEditTargets: 'y', //'n',
-    modeEditPemis: 'y',
-    modeEditGrups: 'y',
-    modeEditUsers: 'y',
-
-    webName: {
-        'eng': 'Permission Service',
-        'cht': '權限管理系統',
-    },
-    webDescription: {
-        'eng': 'A web service package for user permissions and management targets.',
-        'cht': '基於簡易分層架構來給予與設定使用者所需之權限及群組管理功能',
-    },
-    webLogo: 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjQ4IiB3aWR0aD0iNDgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTQ4IDBIMHY0OGg0OFYwWiIgZmlsbD0iI2ZmZiIgZmlsbC1vcGFjaXR5PSIuMDEiLz48cGF0aCBkPSJNMzcuODU2IDIwdjhNMjcuNDY0IDM4bDMuNDY0LTIgMy40NjQtMk0yMC41MzYgMzhsLTMuNDY1LTItMy40NjQtMk0xMC4xNDQgMjB2OE0xMy42MDcgMTRsMy40NjUtMiAzLjQ2NC0yTTI3LjQ2NCAxMGwzLjQ2NCAyIDMuNDY0IDIiIHN0cm9rZT0iI0ZGOTgwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjIiLz48cGF0aCBkPSJNMjQgNDRhNCA0IDAgMSAwIDAtOCA0IDQgMCAwIDAgMCA4Wk0yNCAxMmE0IDQgMCAxIDAgMC04IDQgNCAwIDAgMCAwIDhaTTI0IDI4YTQgNCAwIDEgMCAwLTggNCA0IDAgMCAwIDAgOFpNMzggMjBhNCA0IDAgMSAwIDAtOCA0IDQgMCAwIDAgMCA4Wk0zOCAzNmE0IDQgMCAxIDAgMC04IDQgNCAwIDAgMCAwIDhaTTEwIDIwYTQgNCAwIDEgMCAwLTggNCA0IDAgMCAwIDAgOFpNMTAgMzZhNCA0IDAgMSAwIDAtOCA0IDQgMCAwIDAgMCA4WiIgZmlsbD0iI0ZGRTBCMiIgc3Ryb2tlPSIjRkY5ODAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHN0cm9rZS13aWR0aD0iMiIvPjwvc3ZnPg==',
-
-    // kpLangExt: {
-    //     mmTargets: {
-    //         eng: `Current features list`,
-    //         cht: `現有功能清單`,
-    //     },
-    //     mmTargetsMsg: {
-    //         eng: `Features generally refer to entities such as pages, data, etc., and can also include features or services.`,
-    //         cht: `現有功能泛指實體的頁面、數據等，亦可為的功能或服務。`,
-    //     },
-    // },
-
-}
-
-let getUserByToken = async (token) => {
-    // console.log('getUserByToken/token', token)
-    // console.log('於生產環境時得加入SSO等驗證token機制')
-    // return {} //測試無法登入
-    if (token === '{token-for-application}') { //提供外部應用系統作為存取使用者
-        return {
-            id: 'id-for-application',
-            name: 'application',
-            email: 'application@example.com',
-            isAdmin: 'y',
-        }
-    }
-    if (token === 'sys') { //開發階段w-ui-loginout自動給予browser使用者(且位於localhost)的token為sys
-        return {
-            id: 'id-for-admin',
-            name: 'admin',
-            email: 'admin@example.com', //mappingBy為email, 開發階段時會使用email找到所建置之使用者資料
-            isAdmin: 'y',
-        }
-    }
-    console.log('invalid token', token)
-    return {}
-}
-
-let verifyClientUser = (user, from) => {
-    // console.log('verifyClientUser/user', user)
-    // console.log('於生產環境時得加入限制瀏覽器使用者身份機制')
-    // return false //測試無法登入
-    return user.isAdmin === 'y' //測試僅系統管理者使用
-}
-
-let verifyAppUser = (user, from) => {
-    // console.log('verifyAppUser/user', user)
-    // console.log('於生產環境時得加入限制應用程式使用者身份機制')
-    // return false //測試無法登入
-    return user.isAdmin === 'y' //測試僅系統管理者使用
-}
-
-//WWebPerm
-let instWWebPerm = WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser, opt)
-
-instWWebPerm.on('error', (err) => {
-    console.log(err)
-})
-
-//node srv.mjs
+import fs from 'fs'
+import JSON5 from 'json5'
+import WOrm from 'w-orm-lmdb/src/WOrmLmdb.mjs'
+import WWebPerm from './server/WWebPerm.mjs'
+import getSettings from './g.getSettings.mjs'
+
+
+//st(DB 設定)
+let st = getSettings()
+
+let url = st.dbUrl
+let db = st.dbName
+
+//app 設定來源: argv[2] 指定之 settings 檔(供 e2e restartBackend 注入不同語系等), 預設 ./settings.json.(對齊 SSO srv.mjs)
+//JSON5 格式(無引號鍵 / 單引號 / 註解 / 尾逗號); language / webName / modeEdit* / webLogo 等資料設定皆在此檔.
+let pathSettings = process.argv[2] || './settings.json'
+let appSt = JSON5.parse(fs.readFileSync(pathSettings, 'utf8'))
+
+let opt = {
+
+    useCheckUser: false,
+    getUserById: null,
+    useExcludeWhenNotAdmin: false,
+
+    //serverPort / subfolder / urlRedirect / showLanguage / language / showModeEdit* / modeEdit* / webName / webDescription / webLogo / kpLangExt 皆由 settings.json 提供
+    ...appSt,
+
+}
+
+let getUserByToken = async (token) => {
+    // console.log('getUserByToken/token', token)
+    // console.log('於生產環境時得加入SSO等驗證token機制')
+    // return {} //測試無法登入
+    if (token === '{token-for-application}') { //提供外部應用系統作為存取使用者
+        return {
+            id: 'id-for-application',
+            name: 'application',
+            email: 'application@example.com',
+            isAdmin: 'y',
+        }
+    }
+    if (token === 'sys') { //開發階段w-ui-loginout自動給予browser使用者(且位於localhost)的token為sys
+        return {
+            id: 'id-for-admin',
+            name: 'admin',
+            email: 'admin@example.com', //mappingBy為email, 開發階段時會使用email找到所建置之使用者資料
+            isAdmin: 'y',
+        }
+    }
+    console.log('invalid token', token)
+    return {}
+}
+
+let verifyClientUser = (user, from) => {
+    // console.log('verifyClientUser/user', user)
+    // console.log('於生產環境時得加入限制瀏覽器使用者身份機制')
+    // return false //測試無法登入
+    return user.isAdmin === 'y' //測試僅系統管理者使用
+}
+
+let verifyAppUser = (user, from) => {
+    // console.log('verifyAppUser/user', user)
+    // console.log('於生產環境時得加入限制應用程式使用者身份機制')
+    // return false //測試無法登入
+    return user.isAdmin === 'y' //測試僅系統管理者使用
+}
+
+//WWebPerm
+let instWWebPerm = WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser, opt)
+
+instWWebPerm.on('error', (err) => {
+    console.log(err)
+})
+
+//node srv.mjs
+//node srv.mjs <pathSettings>  //指定 settings 檔(e2e 注入語系用)

package/tableTags.json

@@ -1 +1 @@
-{"grups":"2026-03-29T21:41:46+08:00|yI6vlG","pemis":"2026-03-29T21:41:46+08:00|eXQml3","targets":"2026-03-29T21:41:46+08:00|CdW12e","users":"2026-03-29T22:01:58+08:00|dDEKFJ"}
+{"grups":"2026-07-11T17:38:16+08:00|oibw7P","pemis":"2026-07-11T17:38:16+08:00|cnWe25","targets":"2026-07-11T17:38:16+08:00|OChCfm","users":"2026-07-11T17:38:16+08:00|7oyfiw"}