w-web-perm 1.0.49 → 1.0.50

package/src/components/LayoutContentTargets.vue

@@ -284,7 +284,6 @@ export default {
             mdiPencilOutline,
             mdiContentCopy,
 
-            panelWidth: 100,
             panelHeight: 100,
             headHeight: 100,
 
@@ -489,9 +488,9 @@ export default {
 
             let c = ''
             let b = false
-            b = iseobj(vo.errItemsByName)
+            b = iseobj(vo.errItemsById)
             if (b) {
-                c = vo.$t('errInNames')
+                c = vo.$t('errInIds')
             }
 
             return c
@@ -522,7 +521,6 @@ export default {
             let vo = this
 
             //panelWidth, panelHeight
-            vo.panelWidth = msg.snew.offsetWidth
             vo.panelHeight = msg.snew.offsetHeight
 
         },
@@ -610,7 +608,7 @@ export default {
                     defHeadMinWidth: 150,
                     kpHeadWidth: {
                         'id': isnum(vo.widthTargetId) ? cdbl(vo.widthTargetId) : 600,
-                        'description': isnum(vo.widthTargetId) ? cdbl(vo.widthTargetId) : 600,
+                        'description': isnum(vo.widthTargetDescription) ? cdbl(vo.widthTargetDescription) : 600,
                         'timeCreate': 220,
                         'timeUpdate': 220,
                     },

package/src/components/LayoutContentUsers.vue

@@ -300,7 +300,6 @@ export default {
             mdiPencilOutline,
             mdiContentCopy,
 
-            panelWidth: 100,
             panelHeight: 100,
             headHeight: 100,
 
@@ -618,7 +617,6 @@ export default {
             let vo = this
 
             //panelWidth, panelHeight
-            vo.panelWidth = msg.snew.offsetWidth
             vo.panelHeight = msg.snew.offsetHeight
 
         },

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))
@@ -814,7 +812,10 @@ export default {
                     vo.bShow = false
 
                 })
-                .catch(() => { })
+                .catch((err) => {
+                    console.log('doSave', err)
+                    vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' }) //§5.1: 非預期例外須告知, 不靜默吞 (失敗時 .then 不執行→視窗不關)
+                })
                 .finally(() => {
 
                     //hide loading

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))
@@ -814,7 +812,10 @@ export default {
                     vo.bShow = false
 
                 })
-                .catch(() => { })
+                .catch((err) => {
+                    console.log('doSave', err)
+                    vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' }) //§5.1: 非預期例外須告知, 不靜默吞 (失敗時 .then 不執行→視窗不關)
+                })
                 .finally(() => {
 
                     //hide loading

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))
@@ -749,7 +747,10 @@ export default {
                     vo.bShow = false
 
                 })
-                .catch(() => { })
+                .catch((err) => {
+                    console.log('doSave', err)
+                    vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' }) //§5.1: 非預期例外須告知, 不靜默吞 (失敗時 .then 不執行→視窗不關)
+                })
                 .finally(() => {
 
                     //hide loading

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,30 +958,19 @@ export default {
 
             let vo = this
 
-            //errTemp
-            let errTemp = null
-
-            //check
-            if (size(rows) === 0) {
-                vo.$ui.updateLoading(false) //showCheckYes 前關 loading（modal 阻斷、避免 clickSave 包裝層 loading 疊在 modal 後）
-                await vo.$dg.showCheckYes(`${vo.$t('userSaveUsersEmpty')}`)
-                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.$ui.updateLoading(false)
-                await vo.$dg.showCheckYes(`${vo.$t('userSaveUsersFail')}: ${vo.$tErr(errTemp)}`)
+            if (!okSave) {
                 return
             }
 
-            //alert
+            //alert（showCheckYes 前關 loading，避免 modal 等待期間 loading 疊在底下）
             vo.$ui.updateLoading(false)
             await vo.$dg.showCheckYes(vo.$t('userSaveUsersSuccess'), { type: 'success' })
 
@@ -1023,16 +1010,20 @@ export default {
 
             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)
@@ -1099,7 +1090,10 @@ export default {
                     vo.bShow = false
 
                 })
-                .catch(() => { })
+                .catch((err) => {
+                    console.log('doSave', err)
+                    vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' }) //§5.1: 非預期例外須告知, 不靜默吞 (失敗時 .then 不執行→視窗不關)
+                })
                 .finally(() => {
 
                     //hide loading

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,30 +958,19 @@ export default {
 
             let vo = this
 
-            //errTemp
-            let errTemp = null
-
-            //check
-            if (size(rows) === 0) {
-                vo.$ui.updateLoading(false) //showCheckYes 前關 loading（modal 阻斷、避免 clickSave 包裝層 loading 疊在 modal 後）
-                await vo.$dg.showCheckYes(`${vo.$t('grupSaveGrupsEmpty')}`)
-                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.$ui.updateLoading(false)
-                await vo.$dg.showCheckYes(`${vo.$t('grupSaveGrupsFail')}: ${vo.$tErr(errTemp)}`)
+            if (!okSave) {
                 return
             }
 
-            //alert
+            //alert（showCheckYes 前關 loading，避免 modal 等待期間 loading 疊在底下）
             vo.$ui.updateLoading(false)
             await vo.$dg.showCheckYes(vo.$t('grupSaveGrupsSuccess'), { type: 'success' })
 
@@ -1023,16 +1010,20 @@ export default {
 
             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)
@@ -1099,7 +1090,10 @@ export default {
                     vo.bShow = false
 
                 })
-                .catch(() => { })
+                .catch((err) => {
+                    console.log('doSave', err)
+                    vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' }) //§5.1: 非預期例外須告知, 不靜默吞 (失敗時 .then 不執行→視窗不關)
+                })
                 .finally(() => {
 
                     //hide loading

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,22 +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次完成同步
@@ -76,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/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'
 
 
@@ -225,19 +191,6 @@ function tErr(err) {
 }
 
 
-function gv(o, k, cv = null) {
-    let r = get(o, k, '')
-    if (!isestr(r)) {
-        let def = getKpText('empty')
-        return def
-    }
-    if (isfun(cv)) {
-        r = cv(r)
-    }
-    return r
-}
-
-
 function syncHeight() {
 
     //heightToolbar
@@ -302,7 +255,6 @@ let mUI = {
     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/tableTags.json

@@ -1 +1 @@
-{"grups":"2026-06-22T14:53:50+08:00|dxIazx","pemis":"2026-06-22T14:53:50+08:00|kg4x7v","targets":"2026-06-22T14:53:50+08:00|jNJCZK","users":"2026-06-22T14:53:50+08:00|zponD1"}
+{"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"}