w-web-perm 1.0.12 → 1.0.13

package/g.initialData.mjs

@@ -1,111 +1,211 @@
-import map from 'lodash-es/map'
-import ds from './src/schema/index.mjs'
-import { woItems } from './g.mOrm.mjs'
-
-
-async function initialData() {
-    let rs
-
-
-    rs = [
-        ['viewer', '普通瀏覽者', 'id-for-權限群組1'],
-        ['basic', '一般使用者', 'id-for-權限群組2'],
-        ['admin', '系統管理者', 'id-for-權限群組3'],
-    ]
-    rs = map(rs, ([key, name, ruleGroupsIds], k) => {
-        let v = ds.users.funNew({
-            order: k,
-            name,
-            email: `${key}@example.com`,
-            ruleGroupsIds,
-            userId: 'id-for-admin',
-        })
-        v.id = `id-for-${key}`
-        if (key === 'admin') {
-            v.isAdmin = 'y'
-        }
-        return v
-    })
-    await woItems.users.delAll()
-    await woItems.users.insert(rs)
-
-
-    //人工建置數據時得要嚴格建立各階分層, 否則會無法查找到自動建立之parentId
-    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',
-        '專案B/頁A/區塊A',
-        '專案B/頁A/區塊A/下載報表按鈕',
-        '專案B/頁A/區塊A/下載數據按鈕',
-        '專案B/頁B/區塊A',
-        '專案B/頁B/區塊B',
-        '專案B/頁B/區塊B/顯示後台按鈕',
-        '專案B/頁B/區塊B/轉跳主站按鈕',
-    ]
-    rs = map(rs, (key, k) => {
-        let v = ds.targets.funNew({
-            order: k,
-            description: key,
-        })
-        v.id = key
-        return v
-    })
-    await woItems.targets.delAll()
-    await woItems.targets.insert(rs)
-
-    rs = [
-        ['權限群組1', '權限群組1之說明',
-            `{ 
-                "___all___": { "show": "y", "active": "n" }, 
-                "專案A/頁A": { "show": "y", "active": "y" }, 
-                "專案A/頁B": { "show": "n", "active": "n" },
-            }`
-        ],
-        ['權限群組2', '權限群組2之說明',
-            `{ 
-                "___all___": { "show": "y", "active": "n" }, 
-            }`
-        ],
-        ['權限群組3', '權限群組3之說明',
-            `{ 
-                "___all___": { "show": "y", "active": "y" }, 
-            }`
-        ],
-    ]
-    rs = map(rs, ([name, description, crules], k) => {
-        let v = ds.ruleGroups.funNew({
-            order: k,
-            name,
-            description,
-            crules,
-            userId: 'id-for-admin',
-        })
-        v.id = `id-for-${name}`
-        return v
-    })
-    await woItems.ruleGroups.delAll()
-    await woItems.ruleGroups.insert(rs)
-
-
-}
-
-initialData()
-    .catch((err) => {
-        console.log('initialData catch', err)
-    })
-
-
-//重建資料庫
-//node --experimental-modules --es-module-specifier-resolution=node g.initialData.mjs
+import map from 'lodash-es/map.js'
+import ds from './src/schema/index.mjs'
+import { woItems } from './g.mOrm.mjs'
+
+
+async function initialData() {
+    let rs
+
+
+    rs = [
+
+        '專案A/頁A/區塊A',
+        '專案A/頁A/區塊A/執行按鈕',
+        '專案A/頁A/區塊A/分析按鈕',
+
+        '專案A/頁B/區塊A',
+        '專案A/頁B/區塊A/執行按鈕',
+        '專案A/頁B/區塊A/分析按鈕',
+
+        '專案A/頁B/區塊B/展開按鈕',
+        '專案A/頁B/區塊B/下載按鈕',
+
+        '專案A/頁C',
+
+        '專案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 = ds.targets.funNew({
+            userId: 'id-for-admin',
+            order: k,
+            description: `${key}的說明`,
+        })
+        v.id = key
+        return v
+    })
+    await woItems.targets.delAll()
+    await woItems.targets.insert(rs)
+
+
+    rs = [
+
+        ['權限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, ([name, crules], k) => {
+        let v = ds.pemis.funNew({
+            userId: 'id-for-admin',
+            order: k,
+            name,
+            description: `${name}的說明`,
+            crules,
+        })
+        v.id = `id-for-${name}`
+        return v
+    })
+    await woItems.pemis.delAll()
+    await woItems.pemis.insert(rs)
+
+
+    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 = ds.grups.funNew({
+            userId: 'id-for-admin',
+            order: k,
+            name,
+            description: `${name}的說明`,
+            cpemis,
+        })
+        v.id = `id-for-${name}`
+        return v
+    })
+    await woItems.grups.delAll()
+    await woItems.grups.insert(rs)
+
+
+    rs = [
+
+        ['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, from, cgrups, isAdmin], k) => {
+        let v = ds.users.funNew({
+            userId: 'id-for-admin',
+            order: k,
+            name,
+            email: `${name}@example.com`,
+            from,
+            cgrups,
+            isAdmin,
+        })
+        v.id = `id-for-${name}`
+        if (name === 'john') {
+            v.email = `${v.email};john@test.com`
+        }
+        v.isAdmin = isAdmin //funNew會複寫isAdmin為n, 得另外重置
+        return v
+    })
+    await woItems.users.delAll()
+    await woItems.users.insert(rs)
+
+
+    console.log('finish.')
+}
+
+initialData()
+    .catch((err) => {
+        console.log('initialData catch', err)
+    })
+
+
+//重建資料庫
+//node --experimental-modules g.initialData.mjs

package/g.initialTestData.mjs

@@ -8,6 +8,7 @@ async function initialTestData() {
     //genTestData
     await genTestData(ds, woItems)
 
+    console.log('finish.')
 }
 
 initialTestData()
@@ -17,4 +18,4 @@ initialTestData()
 
 
 //刪除舊檔與重建測試資料庫
-//node --experimental-modules --es-module-specifier-resolution=node g.initialTestData.mjs
+//node --experimental-modules g.initialTestData.mjs

package/g.provideGrups.mjs

@@ -0,0 +1,87 @@
+import map from 'lodash-es/map.js'
+import ds from './src/schema/index.mjs'
+import provideGrups from './server/provideGrups.mjs'
+
+
+async function provide() {
+
+    let url = `http://localhost:11006/syncAndReplaceGrups?token=sys`
+
+    let from = `pd`
+
+    let rs = [
+
+        ['pd-權限群組M1', `
+            {
+                'pd-權限P1': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+                'pd-權限P2': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+            }
+        `],
+        ['pd-權限群組M2', `
+            {
+                'pd-權限P2': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+                'pd-權限P3': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+            }
+        `],
+        ['pd-權限群組M3', `
+            {
+                'pd-權限P2': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+                'pd-權限P3': {
+                    'mode': 'AND',
+                    'isActive': 'y',
+                },
+            }
+        `],
+        ['pd-權限群組M4', `
+            {
+                'pd-權限P3': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+                'pd-權限P4': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                },
+            }
+        `],
+
+    ]
+    rs = map(rs, ([name, cpemis], k) => {
+        let v = ds.grups.funNew({
+            order: k + 1000, //使能排序至最後, 不穿插至原測試
+            name,
+            description: `${name}的說明`,
+            cpemis,
+        })
+        v.id = `id-for-${name}`
+        return v
+    })
+    console.log('rs', rs)
+
+    let r = await provideGrups(url, from, rs)
+    console.log('r.msg', r.msg)
+
+}
+
+provide()
+    .catch((err) => {
+        console.log('provide catch', err)
+    })
+
+
+//node --experimental-modules g.provideGrups.mjs

package/g.providePemis.mjs

@@ -0,0 +1,43 @@
+import map from 'lodash-es/map.js'
+import ds from './src/schema/index.mjs'
+import providePemis from './server/providePemis.mjs'
+
+
+async function provide() {
+
+    let url = `http://localhost:11006/syncAndReplacePemis?token=sys`
+
+    let from = `pd`
+
+    let rs = [
+
+        ['pd-權限P1', `{  "pd-專案A/頁A/區塊A": 'y', "pd-專案A/頁B/區塊A": 'n', "pd-專案A/頁C": 'n' }`],
+        ['pd-權限P2', `{  "pd-專案A/頁C": 'y', "pd-專案B/頁A/區塊A": 'y', "pd-專案B/頁A/區塊B": 'y' }`],
+        ['pd-權限P3', `{  "pd-專案A/頁C": 'y', "pd-專案B/頁A/區塊A": 'n', "pd-專案B/頁A/區塊B": 'y', "pd-專案B/頁A/區塊C": 'y' }`],
+        ['pd-權限P4', `{  "pd-專案B/頁B/區塊A/待辦事項清單": 'y', "pd-專案B/頁B/區塊B/顯示後台按鈕": 'n' }`],
+
+    ]
+    rs = map(rs, ([name, crules], k) => {
+        let v = ds.pemis.funNew({
+            order: k + 1000, //使能排序至最後, 不穿插至原測試
+            name,
+            description: `${name}的說明`,
+            crules,
+        })
+        v.id = `id-for-${name}`
+        return v
+    })
+    console.log('rs', rs)
+
+    let r = await providePemis(url, from, rs)
+    console.log('r.msg', r.msg)
+
+}
+
+provide()
+    .catch((err) => {
+        console.log('provide catch', err)
+    })
+
+
+//node --experimental-modules g.providePemis.mjs

package/g.provideTargets.mjs

@@ -1,4 +1,4 @@
-import map from 'lodash-es/map'
+import map from 'lodash-es/map.js'
 import ds from './src/schema/index.mjs'
 import provideTargets from './server/provideTargets.mjs'
 
@@ -10,33 +10,40 @@ async function provide() {
     let from = `pd`
 
     let rs = [
-        'pd-專案A',
-        'pd-專案A/頁A',
+
         'pd-專案A/頁A/區塊A',
         'pd-專案A/頁A/區塊A/執行按鈕',
         'pd-專案A/頁A/區塊A/分析按鈕',
-        'pd-專案A/頁B',
+
         'pd-專案A/頁B/區塊A',
         'pd-專案A/頁B/區塊A/執行按鈕',
         'pd-專案A/頁B/區塊A/分析按鈕',
-        'pd-專案A/頁B/區塊B',
+
         'pd-專案A/頁B/區塊B/展開按鈕',
         'pd-專案A/頁B/區塊B/下載按鈕',
-        'pd-專案B',
-        'pd-專案B/頁A',
+
+        'pd-專案A/頁C',
+
         'pd-專案B/頁A/區塊A',
-        'pd-專案B/頁A/區塊A/下載報表按鈕',
-        'pd-專案B/頁A/區塊A/下載數據按鈕',
+        'pd-專案B/頁A/區塊A/顯示綜合報表',
+        'pd-專案B/頁A/區塊A/顯示當前數據',
+        'pd-專案B/頁A/區塊B',
+        'pd-專案B/頁A/區塊B/下載報表按鈕',
+        'pd-專案B/頁A/區塊B/下載數據按鈕',
+        'pd-專案B/頁A/區塊C',
+
         'pd-專案B/頁B/區塊A',
+        'pd-專案B/頁B/區塊A/待辦事項清單',
+        'pd-專案B/頁B/區塊A/相關資源清單',
         'pd-專案B/頁B/區塊B',
         'pd-專案B/頁B/區塊B/顯示後台按鈕',
         'pd-專案B/頁B/區塊B/轉跳主站按鈕',
+
     ]
     rs = map(rs, (key, k) => {
         let v = ds.targets.funNew({
-            order: 1000 + k,
-            description: key,
-            from,
+            order: k + 1000, //使能排序至最後, 不穿插至原測試數據
+            description: `${key}的說明`,
         })
         v.id = key
         return v
@@ -54,4 +61,4 @@ provide()
     })
 
 
-//node --experimental-modules --es-module-specifier-resolution=node g.provideTargets.mjs
+//node --experimental-modules g.provideTargets.mjs

package/g.provideUsers.mjs

@@ -1,4 +1,4 @@
-import map from 'lodash-es/map'
+import map from 'lodash-es/map.js'
 import ds from './src/schema/index.mjs'
 import provideUsers from './server/provideUsers.mjs'
 
@@ -10,23 +10,55 @@ async function provide() {
     let from = `pd`
 
     let rs = [
-        ['pd-viewer', 'pd-普通瀏覽者', 'id-for-pd-權限群組1'],
-        ['pd-basic', 'pd-一般使用者', 'id-for-pd-權限群組2'],
-        ['pd-admin', 'pd-系統管理者', 'id-for-pd-權限群組3'],
+
+        ['pd-peter', 'teamA', `
+            { 
+                'pd-權限群組M1': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                }
+            }
+        `, 'n'],
+        ['pd-mary', 'teamA', `
+            { 
+                'pd-權限群組M2': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                }
+            }
+        `, 'n'],
+        ['pd-john', 'teamA', `
+            { 
+                'pd-權限群組M3': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                }
+            }
+        `, 'n'],
+        ['pd-admin', '', `
+            { 
+                'pd-權限群組M4': {
+                    'mode': 'OR',
+                    'isActive': 'y',
+                }
+            }
+        `, 'y'],
+
     ]
-    rs = map(rs, ([key, name, ruleGroupsIds], k) => {
+    rs = map(rs, ([name, from, cgrups, isAdmin], k) => {
         let v = ds.users.funNew({
-            order: 1000 + k,
+            order: k + 1000, //使能排序至最後, 不穿插至原測試
             name,
-            email: `${key}@example.com`,
-            ruleGroupsIds,
-            userId: 'id-for-admin',
+            email: `${name}@example.com`,
             from,
+            cgrups,
+            isAdmin,
         })
-        v.id = `id-for-${key}`
-        if (key === 'pd-admin') {
-            v.isAdmin = 'y'
+        v.id = `id-for-${name}`
+        if (name === 'john') {
+            v.email = `${v.email};john@test.com`
         }
+        v.isAdmin = isAdmin
         return v
     })
     console.log('rs', rs)
@@ -42,4 +74,4 @@ provide()
     })
 
 
-//node --experimental-modules --es-module-specifier-resolution=node g.provideUsers.mjs
+//node --experimental-modules g.provideUsers.mjs

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "w-web-perm",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",
-    "axios": "^1.6.8",
+    "axios": "^1.7.7",
     "json5": "^2.2.3",
     "lodash": "^4.17.21",
     "showdown": "^2.1.0",
-    "w-component-vue": "^2.3.80",
+    "w-component-vue": "^2.4.2",
     "w-data-collector": "^1.0.22",
     "w-serv-hapi": "^1.0.13",
-    "w-serv-orm": "^1.0.9",
+    "w-serv-orm": "^1.0.11",
     "w-ui-loginout": "^1.0.8",
-    "wsemi": "^1.7.49"
+    "wsemi": "^1.7.60"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
@@ -29,13 +29,13 @@
     "eslint-plugin-vue": "^9.10.0",
     "vue": "^2.6.14",
     "vuex": "^3.6.2",
-    "w-orm-mongodb": "^1.1.31",
-    "w-package-tools": "^1.0.75"
+    "w-orm-mongodb": "^1.1.32",
+    "w-package-tools": "^1.0.76"
   },
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "test": "mocha --parallel --timeout 60000 --experimental-modules --es-module-specifier-resolution=node",
+    "test": "mocha --parallel --timeout 60000 --experimental-modules",
     "lint": "vue-cli-service lint",
     "deploy": "gh-pages -d docs"
   },