w-web-perm 1.0.22 → 1.0.24

package/docs/WWebPerm.html

@@ -80,7 +80,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WWebPerm.mjs.html">WWebPerm.mjs</a>, <a href="WWebPerm.mjs.html#line132">line 132</a>
+        <a href="WWebPerm.mjs.html">WWebPerm.mjs</a>, <a href="WWebPerm.mjs.html#line135">line 135</a>
     </li></ul></dd>
     
 
@@ -925,7 +925,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Sep 24 2024 21:19:05 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Oct 20 2024 09:46:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebPerm.mjs.html

@@ -48,6 +48,7 @@
             <pre class="prettyprint source linenums"><code>import path from 'path'
 import fs from 'fs'
 import get from 'lodash-es/get.js'
+import each from 'lodash-es/each.js'
 import map from 'lodash-es/map.js'
 import keys from 'lodash-es/keys.js'
 import size from 'lodash-es/size.js'
@@ -67,6 +68,8 @@ import pm2resolve from 'wsemi/src/pm2resolve.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
 import fsIsFile from 'wsemi/src/fsIsFile.mjs'
 import replace from 'wsemi/src/replace.mjs'
+import haskey from 'wsemi/src/haskey.mjs'
+import arrHas from 'wsemi/src/arrHas.mjs'
 import ltdtDiffByKey from 'wsemi/src/ltdtDiffByKey.mjs'
 import ltdtmapping from 'wsemi/src/ltdtmapping.mjs'
 import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
@@ -268,6 +271,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
 
     //urlRedirect
     let urlRedirect = get(opt, 'urlRedirect', '')
+    console.log('urlRedirect', urlRedirect)
 
 
     //mappingBy
@@ -339,6 +343,60 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
             return r
         })
 
+        //ckKey
+        let ckKey = (rows, key) => {
+            let err = null
+
+            //check
+            let kp = {}
+            each(rows, (v, k) => {
+
+                //value
+                let value = get(v, key, '')
+
+                //check
+                if (!isestr(value)) {
+                    err = `rows[${k}].${key} is not an effective string`
+                    return false //跳出
+                }
+
+                //check
+                if (haskey(kp, value)) {
+                    err = `rows[${k}].${key}[${value}] is duplicate`
+                    return false //跳出
+                }
+
+                //kp
+                kp[value] = true
+
+            })
+
+            return err
+        }
+
+        //偵測id,name,email重複
+        let err = null
+        if (true) {
+            if (arrHas(woName, ['targets'])) {
+                err = ckKey(rows, 'id')
+                if (err !== null) {
+                    return Promise.reject(err)
+                }
+            }
+            else if (arrHas(woName, ['targets', 'pemis', 'grups'])) { //users可重複name故不列入
+                err = ckKey(rows, 'name')
+                if (err !== null) {
+                    return Promise.reject(err)
+                }
+            }
+            else if (arrHas(woName, ['users'])) { //users不能重複email
+                err = ckKey(rows, 'email')
+                if (err !== null) {
+                    return Promise.reject(err)
+                }
+            }
+        }
+
         //ltdtDiffByKey
         let ltdtOld = await woItems[woName].select()
         let ltdtNew = rows
@@ -1176,7 +1234,7 @@ export default WWebPerm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Sep 24 2024 21:19:05 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Oct 20 2024 09:46:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Sep 24 2024 21:19:05 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Oct 20 2024 09:46:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-web-perm",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",
@@ -13,7 +13,7 @@
     "w-serv-hapi": "^1.0.13",
     "w-serv-orm": "^1.0.11",
     "w-ui-loginout": "^1.0.8",
-    "wsemi": "^1.7.60"
+    "wsemi": "^1.7.61"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
@@ -30,7 +30,7 @@
     "vue": "^2.6.14",
     "vuex": "^3.6.2",
     "w-orm-mongodb": "^1.1.32",
-    "w-package-tools": "^1.0.76"
+    "w-package-tools": "^1.0.80"
   },
   "scripts": {
     "serve": "vue-cli-service serve",

package/server/WWebPerm.mjs

@@ -1,6 +1,7 @@
 import path from 'path'
 import fs from 'fs'
 import get from 'lodash-es/get.js'
+import each from 'lodash-es/each.js'
 import map from 'lodash-es/map.js'
 import keys from 'lodash-es/keys.js'
 import size from 'lodash-es/size.js'
@@ -20,6 +21,8 @@ import pm2resolve from 'wsemi/src/pm2resolve.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
 import fsIsFile from 'wsemi/src/fsIsFile.mjs'
 import replace from 'wsemi/src/replace.mjs'
+import haskey from 'wsemi/src/haskey.mjs'
+import arrHas from 'wsemi/src/arrHas.mjs'
 import ltdtDiffByKey from 'wsemi/src/ltdtDiffByKey.mjs'
 import ltdtmapping from 'wsemi/src/ltdtmapping.mjs'
 import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
@@ -221,6 +224,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
 
     //urlRedirect
     let urlRedirect = get(opt, 'urlRedirect', '')
+    console.log('urlRedirect', urlRedirect)
 
 
     //mappingBy
@@ -292,6 +296,60 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
             return r
         })
 
+        //ckKey
+        let ckKey = (rows, key) => {
+            let err = null
+
+            //check
+            let kp = {}
+            each(rows, (v, k) => {
+
+                //value
+                let value = get(v, key, '')
+
+                //check
+                if (!isestr(value)) {
+                    err = `rows[${k}].${key} is not an effective string`
+                    return false //跳出
+                }
+
+                //check
+                if (haskey(kp, value)) {
+                    err = `rows[${k}].${key}[${value}] is duplicate`
+                    return false //跳出
+                }
+
+                //kp
+                kp[value] = true
+
+            })
+
+            return err
+        }
+
+        //偵測id,name,email重複
+        let err = null
+        if (true) {
+            if (arrHas(woName, ['targets'])) {
+                err = ckKey(rows, 'id')
+                if (err !== null) {
+                    return Promise.reject(err)
+                }
+            }
+            else if (arrHas(woName, ['targets', 'pemis', 'grups'])) { //users可重複name故不列入
+                err = ckKey(rows, 'name')
+                if (err !== null) {
+                    return Promise.reject(err)
+                }
+            }
+            else if (arrHas(woName, ['users'])) { //users不能重複email
+                err = ckKey(rows, 'email')
+                if (err !== null) {
+                    return Promise.reject(err)
+                }
+            }
+        }
+
         //ltdtDiffByKey
         let ltdtOld = await woItems[woName].select()
         let ltdtNew = rows

package/src/App.vue

@@ -18,6 +18,9 @@
         <VeCpemis></VeCpemis>
         <VeCgrups></VeCgrups>
 
+        <VeGrupBlngUsers></VeGrupBlngUsers>
+        <VePemiBlngGrups></VePemiBlngGrups>
+
     </div>
 </template>
 
@@ -35,6 +38,8 @@ import Layout from './components/Layout.vue'
 import VeCrules from './components/VeCrules.vue'
 import VeCpemis from './components/VeCpemis.vue'
 import VeCgrups from './components/VeCgrups.vue'
+import VeGrupBlngUsers from './components/VeGrupBlngUsers.vue'
+import VePemiBlngGrups from './components/VePemiBlngGrups.vue'
 
 
 export default {
@@ -47,6 +52,8 @@ export default {
         VeCrules,
         VeCpemis,
         VeCgrups,
+        VeGrupBlngUsers,
+        VePemiBlngGrups,
     },
     data: function() {
         return {

package/src/components/LayoutContentGrups.vue

@@ -76,7 +76,7 @@
 
                     <WButtonCircle
                         :paddingStyle="{v:6,h:6}"
-                        :tooltip="$t('grupDeleteChecks')"
+                        :tooltip="$t('grupDeleteCheckGrups')"
                         :icon="mdiTrashCanOutline"
                         :backgroundColor="'#fff'"
                         :backgroundColorHover="'#f2f2f2'"
@@ -141,9 +141,11 @@
 
 <script>
 import { mdiSelectGroup, mdiVectorPolylinePlus, mdiCheckboxMarkedCircle, mdiCloudUploadOutline, mdiTrashCanOutline, mdiPlus, mdiPencilOutline, mdiContentCopy } from '@mdi/js/mdi.js'
+import JSON5 from 'json5'
 import get from 'lodash-es/get.js'
 import set from 'lodash-es/set.js'
 import each from 'lodash-es/each.js'
+import map from 'lodash-es/map.js'
 import size from 'lodash-es/size.js'
 import filter from 'lodash-es/filter.js'
 import sortBy from 'lodash-es/sortBy.js'
@@ -199,6 +201,7 @@ export default {
         let vo = this
 
         //註冊至$dg供使用
+        vo.$dg.showVeGrupBlngUsersById = vo.showVeGrupBlngUsersById
         vo.$dg.showVeCpemisById = vo.showVeCpemisById
 
     },
@@ -238,8 +241,12 @@ export default {
                 return ''
             }
 
-            //cloneDeep
-            let items = cloneDeep(vo.grups)
+            //grups, users
+            let grups = cloneDeep(vo.grups)
+            let users = cloneDeep(vo.users)
+
+            //addUsers
+            let items = vo.addUsers(grups, users)
 
             //save
             vo.items = items
@@ -374,6 +381,7 @@ export default {
                 let ks = [
                     'id',
                     'name',
+                    'belongUsers',
                     'description',
                     'from',
                     'cpemis',
@@ -388,6 +396,7 @@ export default {
                 let kpHead = {
                     'id': vo.$t('id'),
                     'name': vo.$t('name'),
+                    'belongUsers': vo.$t('belongUsers'),
                     'description': vo.$t('description'),
                     'from': vo.$t('from'),
                     'cpemis': vo.$t('grupCpemis'),
@@ -415,13 +424,15 @@ export default {
                     defHeadMinWidth: 150,
                     kpHeadWidth: {
                         'name': 300,
-                        'cpemis': 100,
+                        'belongUsers': 300,
+                        'cpemis': 300,
                         'timeCreate': 220,
                         'timeUpdate': 220,
                     },
                     kpHeadFilterType: {
                         'id': 'text',
                         'name': 'text',
+                        'belongUsers': 'text',
                         'description': 'text',
                         'from': 'text',
                         'cpemis': 'text',
@@ -442,12 +453,15 @@ export default {
                         'name': true,
                     },
                     kpHeadFilter: {
+                        'belongUsers': false,
                         'cpemis': false,
                     },
                     kpHeadSort: {
+                        'belongUsers': false,
                         'cpemis': false,
                     },
                     kpHeadFocusHighlight: { //雖然效果不完全, 但因按鈕與cell有padding可被點擊, 故還是需要開啟
+                        'belongUsers': false,
                         'cpemis': false,
                     },
                     kpCellRender: {
@@ -470,6 +484,23 @@ export default {
 
                             return v
                         },
+                        'belongUsers': (v, k, r) => {
+                            // console.log('kpCellRender belongUsers', v, k, r)
+
+                            //id
+                            let id = get(r, 'id', '')
+                            // console.log('id', id, k, r)
+
+                            //因kpHeadFocusHighlight設定false時, 仍會於點擊其他可focus的cell, 再點回時依然出現highlight的focus邊框, 故改使用stopPropagation強制吃掉點擊訊息
+                            //因stopPropagation只吃掉訊息, 原本focus會處於原本可focus的cell, 再重複點時會於前個focus的cell出現highlight邊框, 故再多使用preventDefault阻止瀏覽器預設行為, 此等同於return false
+                            let t = `
+                                <div onclick="event.stopPropagation();event.preventDefault();" onmousedown="event.stopPropagation();event.preventDefault();">
+                                    <button style="width:100%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;" onclick="$vo.$dg.showVeGrupBlngUsersById('${id}')">${v}</button>
+                                </div>
+                            `
+
+                            return t
+                        },
                         'cpemis': (v, k, r) => {
                             // console.log('kpCellRender cpemis', v, k, r)
 
@@ -481,7 +512,7 @@ export default {
                             //因stopPropagation只吃掉訊息, 原本focus會處於原本可focus的cell, 再重複點時會於前個focus的cell出現highlight邊框, 故再多使用preventDefault阻止瀏覽器預設行為, 此等同於return false
                             let t = `
                                 <div onclick="event.stopPropagation();event.preventDefault();" onmousedown="event.stopPropagation();event.preventDefault();">
-                                    <button style="width:100%;" onclick="$vo.$dg.showVeCpemisById('${id}')">${vo.$t('grupEditCpemisSimple')}</button>
+                                    <button style="width:100%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;" onclick="$vo.$dg.showVeCpemisById('${id}')">${vo.getCpemisText(v)}</button>
                                 </div>
                             `
 
@@ -526,6 +557,74 @@ export default {
 
         },
 
+        addUsers: function(grups, users) {
+            // console.log('method addUsers', grups, users)
+
+            let vo = this
+
+            //parse cgrups
+            users = map(users, (u) => {
+                let kpGrup = JSON5.parse(u.cgrups)
+                u.kpGrup = kpGrup
+                return u
+            })
+            // console.log('users', users)
+
+            //kp
+            let kp = {}
+            each(users, (u) => {
+                each(u.kpGrup, (v, k) => {
+                    let isActive = get(v, 'isActive', '')
+                    if (isActive !== 'y') {
+                        return true //跳出換下一個
+                    }
+                    if (!haskey(kp, k)) {
+                        kp[k] = []
+                    }
+                    kp[k].push({
+                        user: u,
+                        grup: v,
+                    })
+                })
+            })
+            // console.log('kp', kp)
+
+            //items
+            let items = map(grups, (g) => {
+
+                //us
+                let us = []
+                if (haskey(kp, g.name)) {
+                    us = kp[g.name]
+                }
+                // console.log('us', us)
+
+                //belongUsers
+                let belongUsers = vo.$t('grupBlngRnderNoUser')
+                let t = vo.$t('grupBlngRnderUsers')
+                let n = size(us)
+                if (n > 0) {
+                    t = t.replace('{n}', n)
+                    if (n === 1) {
+                        t = t.replace('{nms}', `(${us[0].user.name})`)
+                    }
+                    else {
+                        t = t.replace('{nms}', '')
+                    }
+                    belongUsers = t
+                }
+
+                //save belongUsers, us
+                g.belongUsers = belongUsers
+                g.us = us
+
+                return g
+            })
+            // console.log('items', items)
+
+            return items
+        },
+
         addItem: function() {
             // console.log('method addItem')
 
@@ -670,6 +769,86 @@ export default {
 
         },
 
+        getCpemisText: function(cpemis) {
+            // console.log('method getCpemisText', cpemis)
+
+            let vo = this
+
+            //kpPemi
+            let kpPemi = JSON5.parse(cpemis)
+
+            let vs = []
+            each(kpPemi, (v, k) => {
+                // console.log(k, 'v', v)
+
+                //isActive
+                let isActive = get(v, 'isActive', '')
+                if (isActive !== 'y') {
+                    return true //跳出換下一個
+                }
+                // console.log(k, '_isActive', _isActive)
+
+                //push
+                vs.push(k)
+
+            })
+
+            //cpemisText
+            let cpemisText = vo.$t('grupRnderCpemisNoPermission')
+            let t = vo.$t('grupRnderCpemisHasNPermissions')
+            let n = size(vs)
+            if (n > 0) {
+                t = t.replace('{n}', n)
+                if (n === 1) {
+                    t = t.replace('{nms}', `(${vs[0]})`)
+                }
+                else {
+                    t = t.replace('{nms}', '')
+                }
+                cpemisText = t
+            }
+
+            return cpemisText
+        },
+
+        showVeGrupBlngUsersById: function(id) {
+            // console.log('method showVeGrupBlngUsersById', id)
+
+            let vo = this
+
+            //check
+            if (!isestr(id)) {
+                vo.$alert(`${vo.$t('grupEditBlngNoGrupId')}`, { type: 'error' })
+                return
+            }
+
+            //rows
+            let rows = get(vo, 'opt.rows', [])
+
+            //find
+            let r = null
+            // let kr = null
+            each(rows, (v, k) => {
+                if (get(v, 'id', '') === id) {
+                    r = v
+                    // kr = k
+                    return false //跳出
+                }
+            })
+
+            //check
+            if (!iseobj(r)) {
+                vo.$alert(`${vo.$t('grupEditBlngNoGrupData')}`, { type: 'error' })
+                return
+            }
+
+            //showVeGrupBlngUsers
+            vo.$dg.showVeGrupBlngUsers(r)
+                .then(() => {})
+                .catch(() => {})
+
+        },
+
         showVeCpemisById: function(id) {
             // console.log('method showVeCpemisById', id)
 
@@ -677,7 +856,7 @@ export default {
 
             //check
             if (!isestr(id)) {
-                vo.$alert(`${vo.$t('grupEditCpemisNoId')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('grupEditBlngNoGrupId')}`, { type: 'error' })
                 return
             }
 
@@ -697,7 +876,7 @@ export default {
 
             //check
             if (!iseobj(r)) {
-                vo.$alert(`${vo.$t('grupEditCpemisNoGrup')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('grupEditBlngNoGrupData')}`, { type: 'error' })
                 return
             }