w-web-perm 1.0.48 → 1.0.49

package/src/components/LayoutContentUsers.vue

@@ -39,6 +39,7 @@
 
             <!-- 功能區 -->
             <div
+                data-fmid="users-toolbar"
                 style="padding:5px; border-top:1px solid #ddd; display:flex; align-items:center;"
                 _v-if="showIsEditable || isEditable"
             >
@@ -185,6 +186,7 @@
                         :iconColor="'#eee'"
                         :iconColorHover="'#fff'"
                         :shadow="false"
+                        :promiseUnlock="true"
                         @click="saveUsers"
                     ></WButtonCircle>
 
@@ -1148,20 +1150,28 @@ export default {
 
         },
 
-        saveUsers: function() {
-            // console.log('method saveUsers')
+        saveUsers: function(msg) {
 
             let vo = this
 
-            async function core() {
-                let errTemp = null
+            //第一行立刻釋放按鈕視覺鎖
+            msg.pm.resolve()
 
-                //show loading
-                vo.$ui.updateLoading(true)
+            //fire-and-forget, 不 await
+            vo.doSaveUsers()
 
-                //check
+        },
+
+        doSaveUsers: function() {
+            // console.log('method doSaveUsers')
+
+            let vo = this
+
+            async function core() {
+
+                //1) 同步檢測 (在開 loading 之前)
                 if (isestr(vo.isError)) {
-                    vo.$alert(`${vo.isError}`, { type: 'error' })
+                    await vo.$dg.showCheckYes(`${vo.isError}`)
                     return
                 }
 
@@ -1170,35 +1180,34 @@ export default {
 
                 //check
                 if (size(rows) === 0) {
-                    vo.$alert(`${vo.$t('userAddEmpty')}`, { type: 'error' })
+                    await vo.$dg.showCheckYes(`${vo.$t('userAddEmpty')}`)
                     return
                 }
 
-                //updateUsers
+                //2) 確定打 API 才開 loading
+                vo.$ui.updateLoading(true)
+
+                //3) updateUsers, 各自 catch + 旗標短路
+                let okSave = false
                 await vo.$fapi.updateUsers(rows)
-                    .catch((err) => {
-                        errTemp = err
+                    .then(() => { okSave = true })
+                    .catch(async (err) => {
+                        vo.$ui.updateLoading(false) //showCheckYes 前關 loading（modal 阻斷期間避免 loading 疊在底下）
+                        await vo.$dg.showCheckYes(`${vo.$t('userSaveUsersFail')}: ${vo.$tErr(err)}`)
                     })
-
-                //check
-                if (errTemp !== null) {
-                    vo.$alert(`${vo.$t('userSaveUsersFail')}: ${errTemp}`, { type: 'error' })
-                    return
-                }
+                if (!okSave) return
 
                 //isModified
                 vo.isModified = false
 
-                //alert
-                vo.$alert(vo.$t('userSaveUsersSuccess'))
+                //alert（showCheckYes 前關 loading，避免 modal 等待期間 loading 疊在底下）
+                vo.$ui.updateLoading(false)
+                await vo.$dg.showCheckYes(vo.$t('userSaveUsersSuccess'), { type: 'success' })
 
             }
 
             //core
             core()
-                // .then((res) => {
-                //     console.log('then', res)
-                // })
                 .catch((err) => {
                     console.log('catch', err)
                     vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' })

package/src/components/LayoutState.vue

@@ -3,6 +3,9 @@
         :style="`position:absolute; top:0px; left:0px; width:100%; height:100%; transition:all 0.5s linear; display:flex; align-items:center; justify-content:center;`"
     >
 
+        <!-- conn-state 觀看區包覆層（e2e 紅框標注用；display:flex 與原置中內容布局一致，不改視覺） -->
+        <div data-fmid="conn-state" style="display:flex; align-items:center;">
+
         <template v-if="connState==='csIng'">
 
             <img style="width:100px; height:100px;" :src="img_connection">
@@ -63,6 +66,8 @@
 
         </template>
 
+        </div>
+
     </div>
 </template>
 

package/src/components/VeCgrups.vue

@@ -747,6 +747,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
@@ -805,9 +817,6 @@ export default {
                 .catch(() => { })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 

package/src/components/VeCpemis.vue

@@ -747,6 +747,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
@@ -805,9 +817,6 @@ export default {
                 .catch(() => { })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 

package/src/components/VeCrules.vue

@@ -690,6 +690,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
@@ -740,9 +752,6 @@ export default {
                 .catch(() => { })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 

package/src/components/VeGrupBlngUsers.vue

@@ -965,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
             }
 
@@ -977,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' })
 
         },
 
@@ -1006,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
@@ -1087,9 +1102,6 @@ export default {
                 .catch(() => { })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 

package/src/components/VePemiBlngGrups.vue

@@ -965,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
             }
 
@@ -977,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' })
 
         },
 
@@ -1006,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
@@ -1087,9 +1102,6 @@ export default {
                 .catch(() => { })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 

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

@@ -215,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)) {
@@ -290,6 +300,7 @@ let mUI = {
 
     setLang,
     getKpText,
+    tErr,
 
     gv,
     syncHeight,