w-web-perm 1.0.22 → 1.0.24

package/src/components/LayoutContentPemis.vue

@@ -76,7 +76,7 @@
 
                     <WButtonCircle
                         :paddingStyle="{v:6,h:6}"
-                        :tooltip="$t('pemiDeleteChecks')"
+                        :tooltip="$t('pemiDeleteCheckPemis')"
                         :icon="mdiTrashCanOutline"
                         :backgroundColor="'#fff'"
                         :backgroundColorHover="'#f2f2f2'"
@@ -141,9 +141,11 @@
 
 <script>
 import { mdiStackOverflow, 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.showVePemiBlngGrupsById = vo.showVePemiBlngGrupsById
         vo.$dg.showVeCrulesById = vo.showVeCrulesById
 
     },
@@ -238,8 +241,15 @@ export default {
                 return ''
             }
 
-            //cloneDeep
-            let items = cloneDeep(vo.pemis)
+            //pemis, grups
+            let pemis = cloneDeep(vo.pemis)
+            let grups = cloneDeep(vo.grups)
+
+            //addGrups
+            let items = vo.addGrups(pemis, grups)
+
+            // //cloneDeep
+            // let items = cloneDeep(vo.pemis)
 
             //save
             vo.items = items
@@ -374,6 +384,7 @@ export default {
                 let ks = [
                     'id',
                     'name',
+                    'belongGrups',
                     'description',
                     'from',
                     'crules',
@@ -388,6 +399,7 @@ export default {
                 let kpHead = {
                     'id': vo.$t('id'),
                     'name': vo.$t('name'),
+                    'belongGrups': vo.$t('belongGrups'),
                     'description': vo.$t('description'),
                     'from': vo.$t('from'),
                     'crules': vo.$t('pemiCrules'),
@@ -415,13 +427,15 @@ export default {
                     defHeadMinWidth: 150,
                     kpHeadWidth: {
                         'name': 300,
-                        'crules': 100,
+                        'belongGrups': 300,
+                        'crules': 300,
                         'timeCreate': 220,
                         'timeUpdate': 220,
                     },
                     kpHeadFilterType: {
                         'id': 'text',
                         'name': 'text',
+                        'belongGrups': 'text',
                         'description': 'text',
                         'from': 'text',
                         'crules': 'text',
@@ -442,12 +456,15 @@ export default {
                         'name': true,
                     },
                     kpHeadFilter: {
+                        'belongGrups': false,
                         'crules': false,
                     },
                     kpHeadSort: {
+                        'belongGrups': false,
                         'crules': false,
                     },
                     kpHeadFocusHighlight: { //雖然效果不完全, 但因按鈕與cell有padding可被點擊, 故還是需要開啟
+                        'belongGrups': false,
                         'crules': false,
                     },
                     kpCellRender: {
@@ -470,6 +487,23 @@ export default {
 
                             return v
                         },
+                        'belongGrups': (v, k, r) => {
+                            // console.log('kpCellRender belongGrups', 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.showVePemiBlngGrupsById('${id}')">${v}</button>
+                                </div>
+                            `
+
+                            return t
+                        },
                         'crules': (v, k, r) => {
                             // console.log('kpCellRender crules', v, k, r)
 
@@ -481,7 +515,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.showVeCrulesById('${id}')">${vo.$t('pemiEditCrulesSimple')}</button>
+                                    <button style="width:100%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;" onclick="$vo.$dg.showVeCrulesById('${id}')">${vo.$t('pemiEditCrulesSimple')}</button>
                                 </div>
                             `
 
@@ -526,6 +560,74 @@ export default {
 
         },
 
+        addGrups: function(pemis, grups) {
+            // console.log('method addGrups', pemis, grups)
+
+            let vo = this
+
+            //parse cpemis
+            grups = map(grups, (g) => {
+                let kpPemi = JSON5.parse(g.cpemis)
+                g.kpPemi = kpPemi
+                return g
+            })
+            // console.log('users', users)
+
+            //kp
+            let kp = {}
+            each(grups, (g) => {
+                each(g.kpPemi, (v, k) => {
+                    let isActive = get(v, 'isActive', '')
+                    if (isActive !== 'y') {
+                        return true //跳出換下一個
+                    }
+                    if (!haskey(kp, k)) {
+                        kp[k] = []
+                    }
+                    kp[k].push({
+                        grup: g,
+                        pemi: v,
+                    })
+                })
+            })
+            // console.log('kp', kp)
+
+            //items
+            let items = map(pemis, (p) => {
+
+                //gs
+                let gs = []
+                if (haskey(kp, p.name)) {
+                    gs = kp[p.name]
+                }
+                // console.log('gs', gs)
+
+                //belongGrups
+                let belongGrups = vo.$t('pemiBlngRnderNoGrup')
+                let t = vo.$t('pemiBlngRnderGrups')
+                let n = size(gs)
+                if (n > 0) {
+                    t = t.replace('{n}', n)
+                    if (n === 1) {
+                        t = t.replace('{nms}', `(${gs[0].grup.name})`)
+                    }
+                    else {
+                        t = t.replace('{nms}', '')
+                    }
+                    belongGrups = t
+                }
+
+                //save belongGrups, gs
+                p.belongGrups = belongGrups
+                p.gs = gs
+
+                return p
+            })
+            // console.log('items', items)
+
+            return items
+        },
+
         addItem: function() {
             // console.log('method addItem')
 
@@ -670,6 +772,44 @@ export default {
 
         },
 
+        showVePemiBlngGrupsById: function(id) {
+            // console.log('method showVePemiBlngGrupsById', id)
+
+            let vo = this
+
+            //check
+            if (!isestr(id)) {
+                vo.$alert(`${vo.$t('pemiEditBlngGrupsNoPemiId')}`, { 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('pemiEditBlngGrupsNoPemiData')}`, { type: 'error' })
+                return
+            }
+
+            //showVePemiBlngGrups
+            vo.$dg.showVePemiBlngGrups(r)
+                .then(() => {})
+                .catch(() => {})
+
+        },
+
         showVeCrulesById: function(id) {
             // console.log('method showVeCrulesById', id)
 
@@ -677,7 +817,7 @@ export default {
 
             //check
             if (!isestr(id)) {
-                vo.$alert(`${vo.$t('pemiEditCrulesNoId')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('pemiEditCrulesNoPemiId')}`, { type: 'error' })
                 return
             }
 
@@ -697,7 +837,7 @@ export default {
 
             //check
             if (!iseobj(r)) {
-                vo.$alert(`${vo.$t('pemiEditCrulesNoPemi')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('pemiEditCrulesNoPemiData')}`, { type: 'error' })
                 return
             }
 

package/src/components/LayoutContentTargets.vue

@@ -76,7 +76,7 @@
 
                     <WButtonCircle
                         :paddingStyle="{v:6,h:6}"
-                        :tooltip="$t('targetDeleteChecks')"
+                        :tooltip="$t('targetDeleteCheckTargets')"
                         :icon="mdiTrashCanOutline"
                         :backgroundColor="'#fff'"
                         :backgroundColorHover="'#f2f2f2'"

package/src/components/LayoutContentUsers.vue

@@ -76,7 +76,7 @@
 
                     <WButtonCircle
                         :paddingStyle="{v:6,h:6}"
-                        :tooltip="$t('userDeleteChecks')"
+                        :tooltip="$t('userDeleteCheckUsers')"
                         :icon="mdiTrashCanOutline"
                         :backgroundColor="'#fff'"
                         :backgroundColorHover="'#f2f2f2'"
@@ -141,6 +141,7 @@
 
 <script>
 import { mdiAccountGroupOutline, 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'
@@ -468,7 +469,7 @@ export default {
                     },
                     defHeadMinWidth: 150,
                     kpHeadWidth: {
-                        'cgrups': 100,
+                        'cgrups': 300,
                         'isAdmin': 100,
                         'isActive': 100,
                         'timeCreate': 220,
@@ -559,7 +560,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.showVeCgrupsById('${id}')">${vo.$t('userEditCgrupsSimple')}</button>
+                                    <button style="width:100%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;" onclick="$vo.$dg.showVeCgrupsById('${id}')">${vo.getCgrupsText(v)}</button>
                                 </div>
                             `
 
@@ -640,7 +641,7 @@ export default {
 
             //check
             if (!isestr(id)) {
-                vo.$alert(`${vo.$t('userEditNoId')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('userEditNoUserId')}`, { type: 'error' })
                 return
             }
 
@@ -660,7 +661,7 @@ export default {
 
             //check
             if (!iseobj(r)) {
-                vo.$alert(`${vo.$t('userEditNoUser')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('userEditNoUserData')}`, { type: 'error' })
                 return
             }
 
@@ -691,7 +692,7 @@ export default {
 
             //check
             if (!isestr(id)) {
-                vo.$alert(`${vo.$t('userEditNoId')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('userEditNoUserId')}`, { type: 'error' })
                 return
             }
 
@@ -711,7 +712,7 @@ export default {
 
             //check
             if (!iseobj(r)) {
-                vo.$alert(`${vo.$t('userEditNoUser')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('userEditNoUserData')}`, { type: 'error' })
                 return
             }
 
@@ -876,6 +877,48 @@ export default {
 
         },
 
+        getCgrupsText: function(cgrups) {
+            // console.log('method getCgrupsText', cgrups)
+
+            let vo = this
+
+            //kpGrup
+            let kpGrup = JSON5.parse(cgrups)
+
+            let vs = []
+            each(kpGrup, (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)
+
+            })
+
+            //cgrupsText
+            let cgrupsText = vo.$t('userRnderCgrupsNoGroup')
+            let t = vo.$t('userRnderCgrupsHasNGroups')
+            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}', '')
+                }
+                cgrupsText = t
+            }
+
+            return cgrupsText
+        },
+
         showVeCgrupsById: function(id) {
             // console.log('method showVeCgrupsById', id)
 
@@ -883,7 +926,7 @@ export default {
 
             //check
             if (!isestr(id)) {
-                vo.$alert(`${vo.$t('userEditCgrupsNoId')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('userEditCgrupsNoUserId')}`, { type: 'error' })
                 return
             }
 
@@ -903,13 +946,13 @@ export default {
 
             //check
             if (!iseobj(r)) {
-                vo.$alert(`${vo.$t('userEditCgrupsNoUser')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('userEditCgrupsNoUserData')}`, { type: 'error' })
                 return
             }
 
-            //getUserRules
-            let kur = vo.$s.getUserRules(r, vo.grups, vo.pemis, vo.targets)
-            console.log('getUserRules kur', kur)
+            // //getUserRules
+            // let kur = vo.$s.getUserRules(r, vo.grups, vo.pemis, vo.targets)
+            // // console.log('getUserRules kur', kur)
 
             //showVeCgrups
             vo.$dg.showVeCgrups(r)

package/src/components/VeCgrups.vue

@@ -32,7 +32,7 @@
 
                             <WButtonCircle
                                 :paddingStyle="{v:6,h:6}"
-                                :tooltip="$t('cpemiCheckAllYes')"
+                                :tooltip="$t('checkAllYes')"
                                 :icon="mdiCheckboxMultipleMarked"
                                 :backgroundColor="'#fff'"
                                 :backgroundColorHover="'#f2f2f2'"
@@ -41,7 +41,7 @@
                                 :iconColor="'#444'"
                                 :iconColorHover="'#222'"
                                 :shadow="false"
-                                @click="toggleItemsEnableAllYes"
+                                @click="showVeCgrupsToggleItemsEnableAllYes"
                             ></WButtonCircle>
 
                             <div style="padding-left:6px;"></div>
@@ -52,7 +52,7 @@
 
                             <WButtonCircle
                                 :paddingStyle="{v:6,h:6}"
-                                :tooltip="$t('cpemiCheckAllNo')"
+                                :tooltip="$t('checkAllNo')"
                                 :icon="mdiCheckboxMultipleBlankOutline"
                                 :backgroundColor="'#fff'"
                                 :backgroundColorHover="'#f2f2f2'"
@@ -61,7 +61,7 @@
                                 :iconColor="'#444'"
                                 :iconColorHover="'#222'"
                                 :shadow="false"
-                                @click="toggleItemsEnableAllNo"
+                                @click="showVeCgrupsToggleItemsEnableAllNo"
                             ></WButtonCircle>
 
                             <div style="padding-left:6px;"></div>
@@ -72,7 +72,7 @@
 
                             <WButtonCircle
                                 :paddingStyle="{v:6,h:6}"
-                                :tooltip="$t('cpemiCheckAllInv')"
+                                :tooltip="$t('checkAllInv')"
                                 :icon="mdiCodeTagsCheck"
                                 :backgroundColor="'#fff'"
                                 :backgroundColorHover="'#f2f2f2'"
@@ -81,7 +81,7 @@
                                 :iconColor="'#444'"
                                 :iconColorHover="'#222'"
                                 :shadow="false"
-                                @click="toggleItemsEnableAllInv"
+                                @click="showVeCgrupsToggleItemsEnableAllInv"
                             ></WButtonCircle>
 
                             <div style="padding-left:6px;"></div>
@@ -92,7 +92,7 @@
 
                             <WButtonCircle
                                 :paddingStyle="{v:6,h:6}"
-                                :tooltip="$t('cpemiDeleteCheckTargets')"
+                                :tooltip="$t('cgrupDeleteCheckPemis')"
                                 :icon="mdiTrashCanOutline"
                                 :backgroundColor="'#fff'"
                                 :backgroundColorHover="'#f2f2f2'"
@@ -215,8 +215,8 @@ export default {
 
         //set
         Vue.prototype.$dg.showVeCgrups = vo.show
-        Vue.prototype.$dg.toggleItemModeByName = vo.toggleItemModeByName
-        Vue.prototype.$dg.toggleItemEnableByName = vo.toggleItemEnableByName
+        Vue.prototype.$dg.showVeCgrupsToggleItemModeByName = vo.showVeCgrupsToggleItemModeByName
+        Vue.prototype.$dg.showVeCgrupsToggleItemEnableByName = vo.showVeCgrupsToggleItemEnableByName
 
     },
     computed: {
@@ -353,8 +353,8 @@ export default {
                 //kpHead
                 let kpHead = {
                     'name': vo.$t('pemiName'),
-                    'mode': vo.$t('pemiMode'),
-                    'enable': vo.$t('pemiEnable'),
+                    'mode': vo.$t('operEnable'),
+                    'enable': vo.$t('operMode'),
                 }
 
                 //opt
@@ -372,8 +372,8 @@ export default {
                     //     'enable': true,
                     // },
                     kpHeadWidth: {
-                        'mode': 50,
-                        'enable': 50,
+                        'mode': 100,
+                        'enable': 100,
                     },
                     // kpRowDrag: {
                     //     'name': true,
@@ -407,7 +407,7 @@ export default {
                             // console.log('mode', mode, k, r)
 
                             let t = `
-                                <select onchange="$vo.$dg.toggleItemModeByName('${name}',this.value)">
+                                <select onchange="$vo.$dg.showVeCgrupsToggleItemModeByName('${name}',this.value)">
                                     <option value="OR" ${mode === 'OR' ? 'selected' : ''}>OR</option>
                                     <option value="AND" ${mode === 'AND' ? 'selected' : ''}>AND</option>
                                 </select>
@@ -423,7 +423,7 @@ export default {
                             // console.log('name', name, k, r)
 
                             let t = `
-                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.toggleItemEnableByName('${name}')" />
+                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.showVeCgrupsToggleItemEnableByName('${name}')" />
                             `
 
                             return t
@@ -521,14 +521,14 @@ export default {
             return rows
         },
 
-        toggleItemModeByName: function(name, mode) {
-            // console.log('toggleItemModeByName', name, mode)
+        showVeCgrupsToggleItemModeByName: function(name, mode) {
+            // console.log('showVeCgrupsToggleItemModeByName', name, mode)
 
             let vo = this
 
             //check
             if (!isestr(name)) {
-                vo.$alert(`${vo.$t('cpemiEditNoName')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('cgrupEditNoName')}`, { type: 'error' })
                 return
             }
 
@@ -548,13 +548,13 @@ export default {
 
             //check
             if (!iseobj(r)) {
-                vo.$alert(`${vo.$t('cpemiEditNoPemi')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('cgrupEditNoPemi')}`, { type: 'error' })
                 return
             }
 
             //mode
             // let mode = th.value
-            console.log('mode', mode)
+            // console.log('mode', mode)
 
             //set
             set(vo, `opt.rows[${kr}].mode`, mode)
@@ -568,14 +568,14 @@ export default {
 
         },
 
-        toggleItemEnableByName: function(name) {
-            // console.log('toggleItemEnableByName', name)
+        showVeCgrupsToggleItemEnableByName: function(name) {
+            // console.log('showVeCgrupsToggleItemEnableByName', name)
 
             let vo = this
 
             //check
             if (!isestr(name)) {
-                vo.$alert(`${vo.$t('cpemiEditNoName')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('cgrupEditNoName')}`, { type: 'error' })
                 return
             }
 
@@ -595,7 +595,7 @@ export default {
 
             //check
             if (!iseobj(r)) {
-                vo.$alert(`${vo.$t('cpemiEditNoPemi')}`, { type: 'error' })
+                vo.$alert(`${vo.$t('cgrupEditNoPemi')}`, { type: 'error' })
                 return
             }
 
@@ -616,8 +616,8 @@ export default {
 
         },
 
-        toggleItemsEnableAllYes: function() {
-            // console.log('toggleItemsEnableAllYes')
+        showVeCgrupsToggleItemsEnableAllYes: function() {
+            // console.log('showVeCgrupsToggleItemsEnableAllYes')
 
             let vo = this
 
@@ -655,8 +655,8 @@ export default {
 
         },
 
-        toggleItemsEnableAllNo: function() {
-            // console.log('toggleItemsEnableAllNo')
+        showVeCgrupsToggleItemsEnableAllNo: function() {
+            // console.log('showVeCgrupsToggleItemsEnableAllNo')
 
             let vo = this
 
@@ -694,8 +694,8 @@ export default {
 
         },
 
-        toggleItemsEnableAllInv: function() {
-            // console.log('toggleItemsEnableAllInv')
+        showVeCgrupsToggleItemsEnableAllInv: function() {
+            // console.log('showVeCgrupsToggleItemsEnableAllInv')
 
             let vo = this