w-web-perm 1.0.48 → 1.0.50

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>
 
@@ -298,7 +300,6 @@ export default {
             mdiPencilOutline,
             mdiContentCopy,
 
-            panelWidth: 100,
             panelHeight: 100,
             headHeight: 100,
 
@@ -616,7 +617,6 @@ export default {
             let vo = this
 
             //panelWidth, panelHeight
-            vo.panelWidth = msg.snew.offsetWidth
             vo.panelHeight = msg.snew.offsetHeight
 
         },
@@ -1148,20 +1148,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 +1178,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

@@ -198,7 +198,6 @@ export default {
 
             fullscreen: false,
 
-            panelWidth: 100,
             panelHeight: 100,
             headHeight: 100,
 
@@ -339,7 +338,6 @@ export default {
             let vo = this
 
             //panelWidth, panelHeight
-            vo.panelWidth = msg.panelWidth
             vo.panelHeight = msg.contentHeightMax
 
         },
@@ -411,9 +409,9 @@ export default {
                         'mode': 'text',
                         'enable': 'text',
                     },
-                    // kpHeadCheckBox: {
-                    //     'name': true,
-                    // },
+                    kpHeadCheckBox: {
+                        'name': true,
+                    },
                     rowsChange: (rs) => {
                         // console.log('rowsChange', rs)
                         // console.log('rowsChange cloneDeep(vo.opt.rows)', cloneDeep(vo.opt.rows))
@@ -747,6 +745,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
@@ -802,12 +812,12 @@ export default {
                     vo.bShow = false
 
                 })
-                .catch(() => { })
+                .catch((err) => {
+                    console.log('doSave', err)
+                    vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' }) //§5.1: 非預期例外須告知, 不靜默吞 (失敗時 .then 不執行→視窗不關)
+                })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 

package/src/components/VeCpemis.vue

@@ -198,7 +198,6 @@ export default {
 
             fullscreen: false,
 
-            panelWidth: 100,
             panelHeight: 100,
             headHeight: 100,
 
@@ -339,7 +338,6 @@ export default {
             let vo = this
 
             //panelWidth, panelHeight
-            vo.panelWidth = msg.panelWidth
             vo.panelHeight = msg.contentHeightMax
 
         },
@@ -411,9 +409,9 @@ export default {
                         'mode': 'text',
                         'enable': 'text',
                     },
-                    // kpHeadCheckBox: {
-                    //     'name': true,
-                    // },
+                    kpHeadCheckBox: {
+                        'name': true,
+                    },
                     rowsChange: (rs) => {
                         // console.log('rowsChange', rs)
                         // console.log('rowsChange cloneDeep(vo.opt.rows)', cloneDeep(vo.opt.rows))
@@ -747,6 +745,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
@@ -802,12 +812,12 @@ export default {
                     vo.bShow = false
 
                 })
-                .catch(() => { })
+                .catch((err) => {
+                    console.log('doSave', err)
+                    vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' }) //§5.1: 非預期例外須告知, 不靜默吞 (失敗時 .then 不執行→視窗不關)
+                })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 

package/src/components/VeCrules.vue

@@ -194,7 +194,6 @@ export default {
 
             fullscreen: false,
 
-            panelWidth: 100,
             panelHeight: 100,
             headHeight: 100,
 
@@ -334,7 +333,6 @@ export default {
             let vo = this
 
             //panelWidth, panelHeight
-            vo.panelWidth = msg.panelWidth
             vo.panelHeight = msg.contentHeightMax
 
         },
@@ -401,9 +399,9 @@ export default {
                         'id': 'text',
                         'enable': 'text',
                     },
-                    // kpHeadCheckBox: {
-                    //     'id': true,
-                    // },
+                    kpHeadCheckBox: {
+                        'id': true,
+                    },
                     rowsChange: (rs) => {
                         // console.log('rowsChange', rs)
                         // console.log('rowsChange cloneDeep(vo.opt.rows)', cloneDeep(vo.opt.rows))
@@ -690,6 +688,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
@@ -737,12 +747,12 @@ export default {
                     vo.bShow = false
 
                 })
-                .catch(() => { })
+                .catch((err) => {
+                    console.log('doSave', err)
+                    vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' }) //§5.1: 非預期例外須告知, 不靜默吞 (失敗時 .then 不執行→視窗不關)
+                })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 

package/src/components/VeGrupBlngUsers.vue

@@ -225,7 +225,6 @@ export default {
 
             fullscreen: false,
 
-            panelWidth: 100,
             panelHeight: 100,
             headHeight: 100,
 
@@ -374,7 +373,6 @@ export default {
             let vo = this
 
             //panelWidth, panelHeight
-            vo.panelWidth = msg.panelWidth
             vo.panelHeight = msg.contentHeightMax
 
         },
@@ -960,29 +958,21 @@ export default {
 
             let vo = this
 
-            //errTemp
-            let errTemp = null
-
-            //check
-            if (size(rows) === 0) {
-                vo.$alert(`${vo.$t('userSaveUsersEmpty')}`, { type: 'error' })
-                return
-            }
-
-            //updateUsers
+            //3) updateUsers, 各自 catch + okX 旗標短路 (canonical 五段結構; 空清單檢查已上移至 doSave core())
+            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' })
+            if (!okSave) {
                 return
             }
 
-            //alert
-            vo.$alert(vo.$t('userSaveUsersSuccess'))
+            //alert（showCheckYes 前關 loading，避免 modal 等待期間 loading 疊在底下）
+            vo.$ui.updateLoading(false)
+            await vo.$dg.showCheckYes(vo.$t('userSaveUsersSuccess'), { type: 'success' })
 
         },
 
@@ -1006,18 +996,34 @@ 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
+                //1) 事先檢測 (所有同步檢查在開 loading 之前, 空清單不應先閃 loading)
+                let rows = get(vo, 'opt.rows', [])
+                // console.log('rows', rows)
+                if (size(rows) === 0) {
+                    await vo.$dg.showCheckYes(`${vo.$t('userSaveUsersEmpty')}`)
+                    return
+                }
+
+                //2) 確定打 API 才開 loading
                 vo.$ui.updateLoading(true)
 
                 //delay
                 await delay(300)
 
-                //rows
-                let rows = get(vo, 'opt.rows', [])
-                // console.log('rows', rows)
-
                 //users
                 let users = cloneDeep(vo.users)
                 // console.log('users', users)
@@ -1084,12 +1090,12 @@ export default {
                     vo.bShow = false
 
                 })
-                .catch(() => { })
+                .catch((err) => {
+                    console.log('doSave', err)
+                    vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' }) //§5.1: 非預期例外須告知, 不靜默吞 (失敗時 .then 不執行→視窗不關)
+                })
                 .finally(() => {
 
-                    //save按鈕解除loading
-                    msg.pm.resolve()
-
                     //hide loading
                     vo.$ui.updateLoading(false)
 

package/src/components/VePemiBlngGrups.vue

@@ -225,7 +225,6 @@ export default {
 
             fullscreen: false,
 
-            panelWidth: 100,
             panelHeight: 100,
             headHeight: 100,
 
@@ -374,7 +373,6 @@ export default {
             let vo = this
 
             //panelWidth, panelHeight
-            vo.panelWidth = msg.panelWidth
             vo.panelHeight = msg.contentHeightMax
 
         },
@@ -960,29 +958,21 @@ export default {
 
             let vo = this
 
-            //errTemp
-            let errTemp = null
-
-            //check
-            if (size(rows) === 0) {
-                vo.$alert(`${vo.$t('grupSaveGrupsEmpty')}`, { type: 'error' })
-                return
-            }
-
-            //updateGrups
+            //3) updateGrups, 各自 catch + okX 旗標短路 (canonical 五段結構; 空清單檢查已上移至 doSave core())
+            let okSave = false
             await vo.$fapi.updateGrups(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('grupSaveGrupsFail')}: ${vo.$tErr(err)}`)
                 })
-
-            //check
-            if (errTemp !== null) {
-                vo.$alert(`${vo.$t('grupSaveGrupsFail')}: ${errTemp}`, { type: 'error' })
+            if (!okSave) {
                 return
             }
 
-            //alert
-            vo.$alert(vo.$t('grupSaveGrupsSuccess'))
+            //alert（showCheckYes 前關 loading，避免 modal 等待期間 loading 疊在底下）
+            vo.$ui.updateLoading(false)
+            await vo.$dg.showCheckYes(vo.$t('grupSaveGrupsSuccess'), { type: 'success' })
 
         },
 
@@ -1006,18 +996,34 @@ 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
+                //1) 事先檢測 (所有同步檢查在開 loading 之前, 空清單不應先閃 loading)
+                let rows = get(vo, 'opt.rows', [])
+                // console.log('rows', rows)
+                if (size(rows) === 0) {
+                    await vo.$dg.showCheckYes(`${vo.$t('grupSaveGrupsEmpty')}`)
+                    return
+                }
+
+                //2) 確定打 API 才開 loading
                 vo.$ui.updateLoading(true)
 
                 //delay
                 await delay(300)
 
-                //rows
-                let rows = get(vo, 'opt.rows', [])
-                // console.log('rows', rows)
-
                 //grups
                 let grups = cloneDeep(vo.grups)
                 // console.log('grups', grups)
@@ -1084,12 +1090,12 @@ export default {
                     vo.bShow = false
 
                 })
-                .catch(() => { })
+                .catch((err) => {
+                    console.log('doSave', err)
+                    vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' }) //§5.1: 非預期例外須告知, 不靜默吞 (失敗時 .then 不執行→視窗不關)
+                })
                 .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')
         }
 
     }