w-web-perm 1.0.12 → 1.0.13

package/src/plugins/mUI.mjs

@@ -1,22 +1,22 @@
 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 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'
@@ -149,7 +149,11 @@ function getKpLang() {
 function getKpText(key) {
     // console.log('call getKpText')
     let kpText = get(vo, '$store.state.kpText')
-    return get(kpText, key, '')
+    let t = get(kpText, key, '')
+    if (!isestr(t)) {
+        t = key
+    }
+    return t
 }
 
 
@@ -203,6 +207,18 @@ async function waitData(t = 0) {
 }
 
 
+let kpIcon = {
+    warning: `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAhCAYAAACxzQkrAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOwwAADsMBx2+oZAAAABZ0RVh0Q3JlYXRpb24gVGltZQAwOS8xOS8yNP52YhIAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAADMklEQVRYha2WTWgTQRiGn0k2SU2KNQjmoiL+gGAVD/5gEelAkSKOiILei+hBRAQv/tBDsQiK1CJFDz331tNePAjRm60eBL0pXsSDF+dimmzbZDzsRJNmm+xPXliyOzP7zrNfvpn5hDGGJNJSHQJmAQHcLpbdL0n8RBIgLdVhYBHYb5u+AZeLZfdzXM9UbBpfC8AB/OgIe7+QxDA2kJZqAhgO6Bq2fbEU6y/TUuWB70BpkyG/gL3FsrsS1TtuhO53gcH23Y9jHDlCWqqd+Mmb6zHUA/YVy+7PKP5xIvQkBAx2zNOo5pEipKU6Bnzo6Kg3/N904PcdL5bdj2HniBqh2bYnITDVGmQcyDj+vRDd3+kXkJbqEjDS2mYqK2THTjO0MMfQwhzZsdOYSsfCGrHv9g9IS+UAz9oajUFkHPITV0mVSqRKJfITVxAZBzrT4Jn16A8QcBvY0w4EZDL+/mw8/xIpv60zLfdYj+RAWqrtwGRgpzHQaJm90QiKTlOT1isZEPAI2BpiXC9ttV5d1RVIS3UQuN4HmKZuWM94QMBMiDFRJKznptp0Mi3VGDDeR5imxq13eCB95iz0+JKEmtFj58IDkc5dI7jWaZcQ7cdFOhW0UwdpmHr6WiggLVUBmO4NA6bmYSpVEIMgBjGVKqbm+ZnSW9N2ru5AwANgR28gf9bKzDxry+9ZW35PZWa+ra+Hdti52m1bT3st1S7gK+HKi/+Ha73uP6fTiC0D3TbHjfKAA8Wy+6PZsDFCT0PDAGAQ2Qys12G97t8HnBtd1FEz/YuQluoEsBTFjXoDnDQ5u4o9940PF1wXddPJYtldBmg9gZ9HdTG1GoMPb5G9cBEAZ+9u/ky/QBTyUa2eY0ubFICWSgGnotEYxEAO59gRoAJUcI4fQQzkouRQU6csAykt1TZgKqqDn9Aeq6/fAQWgwOrrt5iqF3aVbdSUlmpI/B49vwiErujaZAxmbZ3syaMArC598gu0eEAAi+L36PkakVZWANRKFQCR35IEBqCaAl4mcUAIRCHvJ3IyGIBXjhHcEYYGcJMkkUomD5gziLut+9Bj4DKQJeLulkACWAUWi2X3HsBfLU4ARuGaUEMAAAAASUVORK5CYII=`,
+}
+function getIcon(icon) {
+    let c = get(kpIcon, icon, '')
+    if (!isestr(c)) {
+        console.log(`invalid icon[${icon}]`)
+    }
+    return c
+}
+
+
 let mUI = {
 
     setVo,
@@ -223,6 +239,8 @@ let mUI = {
 
     waitData,
 
+    getIcon,
+
 }
 
 

package/src/schema/gi.mjs

@@ -5,4 +5,4 @@ import genIndex from 'w-data-collector/src/genIndex.mjs'
 genIndex('./src/schema/tables', './src/schema')
 
 
-//node --experimental-modules --es-module-specifier-resolution=node ./src/schema/gi.mjs
+//node --experimental-modules ./src/schema/gi.mjs

package/src/schema/index.mjs

@@ -1,11 +1,13 @@
-import ruleGroups from './tables/ruleGroups.mjs'
+import grups from './tables/grups.mjs'
+import pemis from './tables/pemis.mjs'
 import targets from './tables/targets.mjs'
 import users from './tables/users.mjs'
 import build from 'w-data-collector/src/build.mjs'
 
 
 let cs = {
-    ruleGroups,
+    grups,
+    pemis,
     targets,
     users,
 }

package/src/schema/tables/grups.mjs

@@ -0,0 +1,154 @@
+import map from 'lodash-es/map.js'
+import keys from 'lodash-es/keys.js'
+import genID from 'wsemi/src/genID.mjs'
+import dtmapping from 'wsemi/src/dtmapping.mjs'
+import dtpick from 'wsemi/src/dtpick.mjs'
+import nowms2str from 'wsemi/src/nowms2str.mjs'
+import now2strp from 'wsemi/src/now2strp.mjs'
+
+
+let keyTable = 'grups'
+let tableNameCht = '權限群組設定'
+let tableNameEng = 'Permissions groups'
+
+
+let settings = {
+    id: {
+        pk: true,
+        name: '主鍵',
+        type: 'STRING',
+    },
+    order: {
+        name: '順序',
+        type: 'INTEGER',
+    },
+    name: {
+        name: '名稱',
+        type: 'STRING',
+    },
+    description: {
+        name: '說明',
+        type: 'TEXT',
+    },
+    from: {
+        name: '來源', //供外部批次變更使用
+        type: 'STRING',
+    },
+    cpemis: {
+        name: '權限清單', //為json字串
+        type: 'TEXT',
+    },
+    userId: {
+        name: '創建使用者主鍵',
+        type: 'STRING',
+    },
+    timeCreate: {
+        name: '創建時間',
+        type: 'STRING',
+    },
+    userIdUpdate: {
+        name: '最新變更使用者主鍵',
+        type: 'STRING',
+    },
+    timeUpdate: {
+        name: '更新時間',
+        type: 'STRING',
+    },
+    // isActive: {
+    //     name: '是否有效',
+    //     type: 'STRING',
+    // },
+}
+
+let funNew = (ndata = {}) => {
+    let o = dtmapping(ndata, keys(settings))
+    o.id = `${now2strp()}-${genID()}`
+    o.userIdUpdate = o.userId
+    o.timeCreate = nowms2str()
+    o.userIdUpdate = o.userId
+    o.timeUpdate = o.timeCreate
+    // o.isActive = 'y'
+    return o
+}
+
+let funTest = () => {
+    let rs = [
+
+        ['權限群組M1', `
+            {
+                '權限P1': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+                '權限P2': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+            }
+        `],
+        ['權限群組M2', `
+            {
+                '權限P2': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+                '權限P3': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+            }
+        `],
+        ['權限群組M3', `
+            {
+                '權限P2': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+                '權限P3': {
+                    'mode': 'AND',
+                    'isActive': 'y',
+                },
+            }
+        `],
+        ['權限群組M4', `
+            {
+                '權限P3': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+                '權限P4': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+            }
+        `],
+
+    ]
+    rs = map(rs, ([name, cpemis], k) => {
+        let v = funNew({
+            userId: 'id-for-admin',
+            order: k,
+            name,
+            description: `${name}的說明`,
+            cpemis,
+        })
+        v.id = `id-for-${name}`
+        v = dtpick(v, keys(settings))
+        return v
+    })
+    console.log(`已產生: ${keyTable} 測試資料`, rs)
+    return rs
+}
+
+let tab = {
+    keyTable,
+    tableNameCht,
+    tableNameEng,
+    settings,
+    funNew,
+    funTest,
+}
+
+
+export default tab
+

package/src/schema/tables/{ruleGroups.mjs → pemis.mjs}

@@ -1,5 +1,5 @@
-import map from 'lodash-es/map.js'
-import keys from 'lodash-es/keys.js'
+import map from 'lodash-es/map.js'
+import keys from 'lodash-es/keys.js'
 import genID from 'wsemi/src/genID.mjs'
 import dtmapping from 'wsemi/src/dtmapping.mjs'
 import dtpick from 'wsemi/src/dtpick.mjs'
@@ -7,9 +7,9 @@ import nowms2str from 'wsemi/src/nowms2str.mjs'
 import now2strp from 'wsemi/src/now2strp.mjs'
 
 
-let keyTable = 'ruleGroups'
-let tableNameCht = '權限群組'
-let tableNameEng = 'Rule groups'
+let keyTable = 'pemis'
+let tableNameCht = '權限設定'
+let tableNameEng = 'Permissions'
 
 
 let settings = {
@@ -31,11 +31,11 @@ let settings = {
         type: 'TEXT',
     },
     from: {
-        name: '來源',
+        name: '來源', //供外部批次變更使用
         type: 'STRING',
     },
     crules: {
-        name: '規則', //為json字串, 例如{ '___all___': {show:'y',active:'n'}, '專案A/頁A': {show:'y',active:'y'}, '專案A/頁B': {show:'n',active:'n'} }
+        name: '管控對象規則清單', //為json字串
         type: 'TEXT',
     },
     userId: {
@@ -54,6 +54,10 @@ let settings = {
         name: '更新時間',
         type: 'STRING',
     },
+    // isActive: {
+    //     name: '是否有效',
+    //     type: 'STRING',
+    // },
 }
 
 let funNew = (ndata = {}) => {
@@ -61,6 +65,7 @@ let funNew = (ndata = {}) => {
     o.id = `${now2strp()}-${genID()}`
     o.userIdUpdate = o.userId
     o.timeCreate = nowms2str()
+    o.userIdUpdate = o.userId
     o.timeUpdate = o.timeCreate
     // o.isActive = 'y'
     return o
@@ -68,16 +73,22 @@ let funNew = (ndata = {}) => {
 
 let funTest = () => {
     let rs = [
-        ['權限群組1', `{ "___all___": { "show": "y", "active": "n" }, "專案A/頁A": { "show": "y", "active": "y" }, "專案A/頁B": { "show": "n", "active": "n" } }`],
-        ['權限群組2', `{ "___all___": { "show": "y", "active": "n" } }`],
-        ['權限群組3', `{ "___all___": { "show": "y", "active": "y" } }`],
+
+        ['權限P1', `{  "專案A/頁A/區塊A": 'y', "專案A/頁B/區塊A": 'n', "專案A/頁C": 'n' }`],
+        ['權限P2', `{  "專案A/頁C": 'y', "專案B/頁A/區塊A": 'y', "專案B/頁A/區塊B": 'y' }`],
+        ['權限P3', `{  "專案A/頁C": 'y', "專案B/頁A/區塊A": 'n', "專案B/頁A/區塊B": 'y', "專案B/頁A/區塊C": 'y' }`],
+        ['權限P4', `{  "專案B/頁B/區塊A/待辦事項清單": 'y', "專案B/頁B/區塊B/顯示後台按鈕": 'n' }`],
+
     ]
-    rs = map(rs, ([g, crules], k) => {
-        let v = funNew({ userId: 'id-for-admin', crules })
-        v.id = `id-for-${g}`
-        v.order = k
-        v.name = g
-        v.description = `${g}的說明`
+    rs = map(rs, ([name, crules], k) => {
+        let v = funNew({
+            userId: 'id-for-admin',
+            order: k,
+            name,
+            description: `${name}的說明`,
+            crules,
+        })
+        v.id = `id-for-${name}`
         v = dtpick(v, keys(settings))
         return v
     })

package/src/schema/tables/targets.mjs

@@ -1,9 +1,9 @@
-import map from 'lodash-es/map.js'
-import keys from 'lodash-es/keys.js'
+import map from 'lodash-es/map.js'
+import keys from 'lodash-es/keys.js'
 import genID from 'wsemi/src/genID.mjs'
 import dtmapping from 'wsemi/src/dtmapping.mjs'
 import dtpick from 'wsemi/src/dtpick.mjs'
-// import nowms2str from 'wsemi/src/nowms2str.mjs'
+import nowms2str from 'wsemi/src/nowms2str.mjs'
 import now2strp from 'wsemi/src/now2strp.mjs'
 
 
@@ -27,48 +27,81 @@ let settings = {
         type: 'TEXT',
     },
     from: {
-        name: '來源',
+        name: '來源', //供外部批次變更使用
         type: 'STRING',
     },
+    userId: {
+        name: '創建使用者主鍵',
+        type: 'STRING',
+    },
+    timeCreate: {
+        name: '創建時間',
+        type: 'STRING',
+    },
+    userIdUpdate: {
+        name: '最新變更使用者主鍵',
+        type: 'STRING',
+    },
+    timeUpdate: {
+        name: '更新時間',
+        type: 'STRING',
+    },
+    // isActive: {
+    //     name: '是否有效',
+    //     type: 'STRING',
+    // },
 }
 
 let funNew = (ndata = {}) => {
     let o = dtmapping(ndata, keys(settings))
     o.id = `${now2strp()}-${genID()}`
-    // o.timeCreate = nowms2str()
-    // o.timeUpdate = o.timeCreate
+    o.userIdUpdate = o.userId
+    o.timeCreate = nowms2str()
+    o.userIdUpdate = o.userId
+    o.timeUpdate = o.timeCreate
     // o.isActive = 'y'
     return o
 }
 
 let funTest = () => {
     let rs = [
-        '專案A',
-        '專案A/頁A',
+
         '專案A/頁A/區塊A',
         '專案A/頁A/區塊A/執行按鈕',
         '專案A/頁A/區塊A/分析按鈕',
-        '專案A/頁B',
+
         '專案A/頁B/區塊A',
         '專案A/頁B/區塊A/執行按鈕',
         '專案A/頁B/區塊A/分析按鈕',
-        '專案A/頁B/區塊B',
+
         '專案A/頁B/區塊B/展開按鈕',
         '專案A/頁B/區塊B/下載按鈕',
-        '專案B',
-        '專案B/頁A',
+
+        '專案A/頁C',
+
         '專案B/頁A/區塊A',
-        '專案B/頁A/區塊A/下載報表按鈕',
-        '專案B/頁A/區塊A/下載數據按鈕',
+        '專案B/頁A/區塊A/顯示綜合報表',
+        '專案B/頁A/區塊A/顯示當前數據',
+        '專案B/頁A/區塊B',
+        '專案B/頁A/區塊B/下載報表按鈕',
+        '專案B/頁A/區塊B/下載數據按鈕',
+        '專案B/頁A/區塊C',
+
         '專案B/頁B/區塊A',
+        '專案B/頁B/區塊A/待辦事項清單',
+        '專案B/頁B/區塊A/相關資源清單',
         '專案B/頁B/區塊B',
         '專案B/頁B/區塊B/顯示後台按鈕',
         '專案B/頁B/區塊B/轉跳主站按鈕',
+
     ]
     rs = map(rs, (key, k) => {
-        let v = funNew({ description: key })
+        let v = funNew({
+            userId: 'id-for-admin',
+            order: k,
+            description: `${key}的說明`,
+        })
         v.id = key
-        v.order = k
         v = dtpick(v, keys(settings))
         return v
     })

package/src/schema/tables/users.mjs

@@ -1,5 +1,5 @@
-import map from 'lodash-es/map.js'
-import keys from 'lodash-es/keys.js'
+import map from 'lodash-es/map.js'
+import keys from 'lodash-es/keys.js'
 import genID from 'wsemi/src/genID.mjs'
 import dtmapping from 'wsemi/src/dtmapping.mjs'
 import dtpick from 'wsemi/src/dtpick.mjs'
@@ -35,12 +35,12 @@ let settings = {
         type: 'TEXT',
     },
     from: {
-        name: '來源',
+        name: '來源', //標注使用者來源, 亦供外部批次變更使用
         type: 'STRING',
     },
-    ruleGroupsIds: {
-        name: '所屬權限群組主鍵', //多主鍵用分號區隔
-        type: 'STRING',
+    cgrups: {
+        name: '權限群組清單', //為json字串
+        type: 'TEXT',
     },
     isAdmin: {
         name: '是否為系統管理員',
@@ -74,6 +74,7 @@ let funNew = (ndata = {}) => {
     o.isAdmin = 'n'
     o.userIdUpdate = o.userId
     o.timeCreate = nowms2str()
+    o.userIdUpdate = o.userId
     o.timeUpdate = o.timeCreate
     o.isActive = 'y'
     return o
@@ -81,32 +82,59 @@ let funNew = (ndata = {}) => {
 
 let funTest = () => {
     let rs = [
-        '王小明',
-        'peter',
-        'mary',
-        'john',
-        'bill',
-        'admin',
+
+        ['peter', 'teamA', `
+            { 
+                '權限群組M1': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                }
+            }
+        `, 'n'],
+        ['mary', 'teamA', `
+            { 
+                '權限群組M2': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                }
+            }
+        `, 'n'],
+        ['john', 'teamA', `
+            { 
+                '權限群組M3': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                }
+            }
+        `, 'n'],
+        ['admin', '', `
+            { 
+                '權限群組M4': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                }
+            }
+        `, 'y'],
+
     ]
-    rs = map(rs, (name, k) => {
-        let v = funNew({ userId: 'id-for-admin', name })
+    rs = map(rs, ([name, from, cgrups, isAdmin], k) => {
+        let v = funNew({
+            userId: 'id-for-admin',
+            order: k,
+            name,
+            email: `${name}@example.com`,
+            from,
+            cgrups,
+            isAdmin,
+        })
         v.id = `id-for-${name}`
-        v.order = k
-        v.email = `${name}@example.com`
+        if (name === 'john') {
+            v.email = `${v.email};john@test.com`
+        }
+        v.isAdmin = isAdmin
         v = dtpick(v, keys(settings))
         return v
     })
-    rs[0].ruleGroupsIds = `id-for-權限群組1;id-for-權限群組2`
-    rs[1].ruleGroupsIds = `id-for-權限群組1`
-    rs[0].from = 'teamA'
-    rs[1].from = 'teamA'
-    rs[2].from = 'teamA'
-    rs[3].from = 'teamB'
-    rs[4].from = 'teamB'
-    rs[4].isActive = 'n'
-    rs[5].ruleGroupsIds = `id-for-權限群組1`
-    rs[5].description = '測試系統管理員描述說明'
-    rs[5].isAdmin = 'y' //admin
     console.log(`已產生: ${keyTable} 測試資料`, rs)
     return rs
 }