w-web-perm 1.0.47 → 1.0.49

package/server/staLogs/staEvent.shellWorker.mjs

@@ -0,0 +1,19 @@
+import { parentPort } from 'worker_threads'
+import staEvent from './staEvent.mjs'
+
+
+parentPort.on('message', async (param) => {
+    try {
+        let r = await staEvent(param.timeLength, param.timeInterval, param.opt)
+        parentPort.postMessage({
+            mode: 'done',
+            payload: r,
+        })
+    }
+    catch (err) {
+        parentPort.postMessage({
+            mode: 'error',
+            payload: err,
+        })
+    }
+})

package/server/staLogs/staEventTable.mjs

@@ -0,0 +1,100 @@
+import ot from 'dayjs'
+import get from 'lodash-es/get.js'
+import each from 'lodash-es/each.js'
+import genPm from 'wsemi/src/genPm.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
+import fsTreeFolder from 'wsemi/src/fsTreeFolder.mjs'
+import fsBuildReadStreamText from 'wsemi/src/fsBuildReadStreamText.mjs'
+
+
+//統計各 event 事件於近 1日/8hr/4hr/1hr 各窗內之發生數量（鏡像 staEvent.mjs 的 NDJSON 讀取方式）。
+//巢狀窗:1hr⊂4hr⊂8hr⊂24hr, 各窗各自累計該窗內出現總數。
+//回傳: [{ event, last1Day, last8Hour, last4Hour, last1Hour }, ...], 依 last1Day 由大到小排序。
+async function staEventTable(opt = {}) {
+
+    //fdLog
+    let fdLog = get(opt, 'fdLog')
+    if (!isestr(fdLog)) {
+        fdLog = './_logs'
+    }
+
+    //now
+    let now = ot()
+
+    //kp, 各 event 名累計各窗計數
+    let kp = {}
+
+    //vpfs
+    let vpfs = fsTreeFolder(fdLog)
+
+    //逐檔逐行讀取
+    for (let vpf of vpfs) {
+
+        //fp
+        let fp = vpf.path
+
+        //ev
+        let ev = fsBuildReadStreamText(fp)
+
+        //line
+        ev.on('line', (line) => {
+            try {
+                let v = JSON.parse(line)
+                let event = v.event
+                if (!isestr(event)) {
+                    return
+                }
+
+                //dh, 距今幾小時(用 dayjs 比較)
+                let dh = now.diff(ot(v.time), 'hour')
+                if (dh < 0 || dh > 24) {
+                    return //超過 1日窗或未來時間略過
+                }
+
+                //初始化
+                if (!kp[event]) {
+                    kp[event] = { last1Day: 0, last8Hour: 0, last4Hour: 0, last1Hour: 0 }
+                }
+
+                //巢狀窗各自累計(1hr⊂4hr⊂8hr⊂24hr)
+                if (dh <= 24) {
+                    kp[event].last1Day += 1
+                }
+                if (dh <= 8) {
+                    kp[event].last8Hour += 1
+                }
+                if (dh <= 4) {
+                    kp[event].last4Hour += 1
+                }
+                if (dh <= 1) {
+                    kp[event].last1Hour += 1
+                }
+            }
+            catch (err) {}
+        })
+
+        //await close
+        let pm = genPm()
+        ev.on('close', () => {
+            pm.resolve()
+        })
+        await pm
+
+    }
+
+    //rs
+    let rs = []
+    each(kp, (vv, event) => {
+        rs.push({
+            event,
+            ...vv,
+        })
+    })
+
+    //依 last1Day 由大到小排序
+    rs.sort((a, b) => b.last1Day - a.last1Day)
+
+    return rs
+}
+
+export default staEventTable

package/server/staLogs/test_staEvent.mjs

@@ -0,0 +1,22 @@
+// import staEvent from './staEvent.mjs' //一般版
+import staEvent from './staEvent.callWorker.mjs' //worker 版
+
+async function main() {
+    let rs = await staEvent(7, 'hr')
+    console.log(JSON.stringify(rs, null, 2))
+}
+main()
+// [
+//   {
+//     "time": "2026-06-21T12",
+//     "data": {
+//       "count": 50,
+//       "verifyConn-success": 42,
+//       "updatePemis-success": 5,
+//       "api/getPerm-success": 3
+//     }
+//   },
+//   ...
+// ]
+
+//node server/staLogs/test_staEvent.mjs

package/settings.json

@@ -0,0 +1,40 @@
+{
+
+    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: `現有功能泛指實體的頁面、數據等，亦可為的功能或服務。`,
+    //     },
+    // },
+
+}

package/src/components/Common/CheckYes.vue

@@ -3,6 +3,8 @@
         :show.sync="bShow"
         :title="$t('systemMessage')"
         :content="content"
+        :contentIcon="contentIcon"
+        :contentIconColor="contentIconColor"
         :_contentColor="'white'"
         :_contentIconColor="'white'"
         :_contentBackgroundColor="'orange lighten-5'"
@@ -15,6 +17,7 @@
 
 <script>
 import Vue from 'vue'
+import { mdiAlert, mdiCheckCircle } from '@mdi/js'
 import genPm from 'wsemi/src/genPm.mjs'
 import WConfirm from 'w-component-vue/src/components/WConfirm.vue'
 
@@ -32,6 +35,10 @@ export default {
 
             content: '',
 
+            //content icon（依 type 切換：success=綠勾，其餘=驚嘆號）
+            contentIcon: mdiAlert,
+            contentIconColor: '#D81B60',
+
         }
     },
     mounted: function() {
@@ -47,7 +54,7 @@ export default {
     },
     methods: {
 
-        show: function (content) {
+        show: function (content, opt = {}) {
             //console.log('methods show', content)
 
             let vo = this
@@ -58,6 +65,16 @@ export default {
             //save
             vo.content = content
 
+            //content icon：type='success' 顯示綠勾，其餘維持驚嘆號
+            if (opt && opt.type === 'success') {
+                vo.contentIcon = mdiCheckCircle
+                vo.contentIconColor = '#2E7D32'
+            }
+            else {
+                vo.contentIcon = mdiAlert
+                vo.contentIconColor = '#D81B60'
+            }
+
             //show
             vo.bShow = true
 

package/src/components/Layout.vue

@@ -2,7 +2,7 @@
     <div style="height:100svh; background:#f5f5f5;">
 
         <!-- menu top, 因窄版導致名稱換行故須使用overflow-y:hidden -->
-        <div :style="`height:${heightToolbar}px; overflow-y:hidden; padding:0px 10px; background:#fff; border-bottom:1px solid #ccc; display:flex; align-items:center;`">
+        <div data-fmid="app-topbar" :style="`height:${heightToolbar}px; box-sizing:border-box; overflow-y:hidden; padding:0px 10px; background:#fff; border-bottom:1px solid #ccc; display:flex; align-items:center;`">
 
             <div style="padding-left:5px; white-space:nowrap">
                 <div style="display:flex; align-items:center;">

package/src/components/LayoutContent.vue

@@ -89,6 +89,11 @@
                                 v-if="menuKey==='mmUsers'"
                             ></LayoutContentUsers>
 
+                            <LayoutContentStaInfor
+                                :drawer="drawer"
+                                v-if="menuKey==='mmStaInfor'"
+                            ></LayoutContentStaInfor>
+
                         </template>
 
                         <div
@@ -129,7 +134,7 @@
 </template>
 
 <script>
-import { mdiArrowLeftBoldHexagonOutline, mdiArrowRightBoldHexagonOutline, mdiGamepadCircle, mdiStackOverflow, mdiSelectGroup, mdiAccountGroupOutline } from '@mdi/js/mdi.js'
+import { mdiArrowLeftBoldHexagonOutline, mdiArrowRightBoldHexagonOutline, mdiGamepadCircle, mdiStackOverflow, mdiSelectGroup, mdiAccountGroupOutline, mdiChartBoxOutline } from '@mdi/js/mdi.js'
 import get from 'lodash-es/get.js'
 import find from 'lodash-es/find.js'
 import WDrawer from 'w-component-vue/src/components/WDrawer.vue'
@@ -139,6 +144,7 @@ import LayoutContentTargets from './LayoutContentTargets.vue'
 import LayoutContentPemis from './LayoutContentPemis.vue'
 import LayoutContentGrups from './LayoutContentGrups.vue'
 import LayoutContentUsers from './LayoutContentUsers.vue'
+import LayoutContentStaInfor from './LayoutContentStaInfor.vue'
 
 
 export default {
@@ -150,6 +156,7 @@ export default {
         LayoutContentPemis,
         LayoutContentGrups,
         LayoutContentUsers,
+        LayoutContentStaInfor,
     },
     props: {
     },
@@ -200,6 +207,11 @@ export default {
                     text: vo.$t('mmUsers'),
                     icon: mdiAccountGroupOutline,
                 },
+                {
+                    key: 'mmStaInfor',
+                    text: vo.$t('mmStaInfor'),
+                    icon: mdiChartBoxOutline,
+                },
             ]
             return ms
         },

package/src/components/LayoutContentGrups.vue

@@ -39,6 +39,7 @@
 
             <!-- 功能區 -->
             <div
+                data-fmid="grups-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="saveGrups"
                     ></WButtonCircle>
 
@@ -369,12 +371,22 @@ export default {
             vo.widthGrupsName = get(vo, 'webInfor.widthGrupsName', '')
             vo.widthGrupsDescription = get(vo, 'webInfor.widthGrupsDescription', '')
 
-            vo.firstSetting = false
+            //會觸發數據變更再導致opt變更導致觸發rowsChange等事件, 故得要延遲, 供組件偵測初始設定數據初始化之用
+            setTimeout(() => {
+                vo.firstSetting = false
+                // console.log('firstSetting', vo.firstSetting)
+            }, 1)
+
         }
 
     },
     computed: {
 
+        syncState: function() {
+            let vo = this
+            return get(vo, '$store.state.syncState')
+        },
+
         webInfor: function() {
             let wi = get(this, `$store.state.webInfor`)
             return wi
@@ -739,6 +751,11 @@ export default {
                         // console.log('rowsChange', rs)
                         // console.log('rowsChange cloneDeep(vo.opt.rows)', cloneDeep(vo.opt.rows))
 
+                        //check
+                        if (!vo.syncState || vo.firstLoading || vo.firstSetting) {
+                            return
+                        }
+
                         //isModified
                         vo.isModified = true
 
@@ -1162,20 +1179,28 @@ export default {
 
         },
 
-        saveGrups: function() {
-            // console.log('method saveGrups')
+        saveGrups: 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.doSaveGrups()
 
-                //check
+        },
+
+        doSaveGrups: function() {
+            // console.log('method doSaveGrups')
+
+            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
                 }
 
@@ -1184,35 +1209,34 @@ export default {
 
                 //check
                 if (size(rows) === 0) {
-                    vo.$alert(`${vo.$t('grupAddEmpty')}`, { type: 'error' })
+                    await vo.$dg.showCheckYes(`${vo.$t('grupAddEmpty')}`)
                     return
                 }
 
-                //updateGrups
+                //2) 確定打 API 才開 loading
+                vo.$ui.updateLoading(true)
+
+                //3) updateGrups, 各自 catch + 旗標短路
+                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' })
-                    return
-                }
+                if (!okSave) return
 
                 //isModified
                 vo.isModified = false
 
-                //alert
-                vo.$alert(vo.$t('grupSaveGrupsSuccess'))
+                //alert（showCheckYes 前關 loading，避免 modal 等待期間 loading 疊在底下）
+                vo.$ui.updateLoading(false)
+                await vo.$dg.showCheckYes(vo.$t('grupSaveGrupsSuccess'), { 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/LayoutContentPemis.vue

@@ -39,6 +39,7 @@
 
             <!-- 功能區 -->
             <div
+                data-fmid="pemis-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="savePemis"
                     ></WButtonCircle>
 
@@ -369,12 +371,22 @@ export default {
             vo.widthPemisName = get(vo, 'webInfor.widthPemisName', '')
             vo.widthPemisDescription = get(vo, 'webInfor.widthPemisDescription', '')
 
-            vo.firstSetting = false
+            //會觸發數據變更再導致opt變更導致觸發rowsChange等事件, 故得要延遲, 供組件偵測初始設定數據初始化之用
+            setTimeout(() => {
+                vo.firstSetting = false
+                // console.log('firstSetting', vo.firstSetting)
+            }, 1)
+
         }
 
     },
     computed: {
 
+        syncState: function() {
+            let vo = this
+            return get(vo, '$store.state.syncState')
+        },
+
         webInfor: function() {
             let wi = get(this, `$store.state.webInfor`)
             return wi
@@ -739,6 +751,11 @@ export default {
                         // console.log('rowsChange', rs)
                         // console.log('rowsChange cloneDeep(vo.opt.rows)', cloneDeep(vo.opt.rows))
 
+                        //check
+                        if (!vo.syncState || vo.firstLoading || vo.firstSetting) {
+                            return
+                        }
+
                         //isModified
                         vo.isModified = true
 
@@ -1164,20 +1181,28 @@ export default {
 
         },
 
-        savePemis: function() {
-            // console.log('method savePemis')
+        savePemis: 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.doSavePemis()
 
-                //check
+        },
+
+        doSavePemis: function() {
+            // console.log('method doSavePemis')
+
+            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
                 }
 
@@ -1186,35 +1211,34 @@ export default {
 
                 //check
                 if (size(rows) === 0) {
-                    vo.$alert(`${vo.$t('pemiAddEmpty')}`, { type: 'error' })
+                    await vo.$dg.showCheckYes(`${vo.$t('pemiAddEmpty')}`)
                     return
                 }
 
-                //updatePemis
+                //2) 確定打 API 才開 loading
+                vo.$ui.updateLoading(true)
+
+                //3) updatePemis, 各自 catch + 旗標短路
+                let okSave = false
                 await vo.$fapi.updatePemis(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('pemiSavePemisFail')}: ${vo.$tErr(err)}`)
                     })
-
-                //check
-                if (errTemp !== null) {
-                    vo.$alert(`${vo.$t('pemiSavePemisFail')}: ${errTemp}`, { type: 'error' })
-                    return
-                }
+                if (!okSave) return
 
                 //isModified
                 vo.isModified = false
 
-                //alert
-                vo.$alert(vo.$t('pemiSavePemisSuccess'))
+                //alert（showCheckYes 前關 loading，避免 modal 等待期間 loading 疊在底下）
+                vo.$ui.updateLoading(false)
+                await vo.$dg.showCheckYes(vo.$t('pemiSavePemisSuccess'), { type: 'success' })
 
             }
 
             //core
             core()
-                // .then((res) => {
-                //     console.log('then', res)
-                // })
                 .catch((err) => {
                     console.log('catch', err)
                     vo.$alert(vo.$t('anUnexpectedErrorOccurred'), { type: 'error' })