w-web-perm 1.0.23 → 1.0.25

package/src/components/VeGrupBlngUsers.vue

@@ -152,9 +152,6 @@ 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 trim from 'lodash-es/trim.js'
-import uniq from 'lodash-es/uniq.js'
-import find from 'lodash-es/find.js'
 import size from 'lodash-es/size.js'
 import filter from 'lodash-es/filter.js'
 import join from 'lodash-es/join.js'
@@ -162,18 +159,11 @@ import sortBy from 'lodash-es/sortBy.js'
 import isEqual from 'lodash-es/isEqual.js'
 import cloneDeep from 'lodash-es/cloneDeep.js'
 import genPm from 'wsemi/src/genPm.mjs'
-import sep from 'wsemi/src/sep.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
 import delay from 'wsemi/src/delay.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
 import WDialog from 'w-component-vue/src/components/WDialog.vue'
-import WText from 'w-component-vue/src/components/WText.vue'
-import WTextSuggest from 'w-component-vue/src/components/WTextSuggest.vue'
-import WSwitch from 'w-component-vue/src/components/WSwitch.vue'
-import WCheckbox from 'w-component-vue/src/components/WCheckbox.vue'
-import WIcon from 'w-component-vue/src/components/WIcon.vue'
-import WButtonChip from 'w-component-vue/src/components/WButtonChip.vue'
 import WButtonCircle from 'w-component-vue/src/components/WButtonCircle.vue'
 import WAggridVueDyn from 'w-component-vue/src/components/WAggridVueDyn.vue'
 
@@ -181,12 +171,6 @@ import WAggridVueDyn from 'w-component-vue/src/components/WAggridVueDyn.vue'
 export default {
     components: {
         WDialog,
-        WText,
-        WTextSuggest,
-        WSwitch,
-        WCheckbox,
-        WIcon,
-        WButtonChip,
         WButtonCircle,
         WAggridVueDyn,
     },
@@ -378,7 +362,7 @@ export default {
                 let kpHead = {
                     'name': vo.$t('userName'),
                     'grupsNames': vo.$t('belongGrupsNames'),
-                    'mode': vo.$t('operEnable'),
+                    'mode': vo.$t('operGrupEnable'),
                     'enable': vo.$t('operMode'),
                 }
 
@@ -576,10 +560,33 @@ export default {
             return rows
         },
 
+        fltKpGrup: function(kp) {
+            // console.log('fltKpGrup', kp)
+
+            let vo = this
+
+            //_kp
+            let _kp = {}
+            each(vo.grups, (v, k) => {
+                _kp[v.name] = true
+            })
+            // console.log('_kp', _kp)
+
+            //kpt
+            let kpt = {}
+            each(kp, (v, k) => {
+                if (haskey(_kp, k)) {
+                    kpt[k] = v
+                }
+            })
+
+            return kpt
+        },
+
         genItems: function(grup, users) {
             // console.log('genItems', grup, users)
 
-            // let vo = this
+            let vo = this
 
             //items
             let items = map(users, (u) => {
@@ -588,6 +595,10 @@ export default {
                 let kpGrup = JSON5.parse(u.cgrups)
                 // console.log(u.name, 'kpGrup', kpGrup)
 
+                //fltKpGrup
+                kpGrup = vo.fltKpGrup(kpGrup)
+                // console.log(u.name, 'kpGrup(fltKpGrup)', kpGrup)
+
                 //mode, enable, grups
                 let mode = 'OR'
                 let enable = 'n'
@@ -670,6 +681,10 @@ export default {
                 let kpGrup = JSON5.parse(u.cgrups)
                 // console.log(u.name, 'kpGrup', kpGrup)
 
+                //fltKpGrup
+                kpGrup = vo.fltKpGrup(kpGrup)
+                // console.log(u.name, 'kpGrup(fltKpGrup)', kpGrup)
+
                 //mode
                 let mode = get(rows, `${ku}.mode`, '')
                 if (mode !== 'OR' && mode !== 'AND') {

package/src/components/VePemiBlngGrups.vue

@@ -152,9 +152,6 @@ 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 trim from 'lodash-es/trim.js'
-import uniq from 'lodash-es/uniq.js'
-import find from 'lodash-es/find.js'
 import size from 'lodash-es/size.js'
 import filter from 'lodash-es/filter.js'
 import join from 'lodash-es/join.js'
@@ -162,18 +159,11 @@ import sortBy from 'lodash-es/sortBy.js'
 import isEqual from 'lodash-es/isEqual.js'
 import cloneDeep from 'lodash-es/cloneDeep.js'
 import genPm from 'wsemi/src/genPm.mjs'
-import sep from 'wsemi/src/sep.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
 import delay from 'wsemi/src/delay.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
 import WDialog from 'w-component-vue/src/components/WDialog.vue'
-import WText from 'w-component-vue/src/components/WText.vue'
-import WTextSuggest from 'w-component-vue/src/components/WTextSuggest.vue'
-import WSwitch from 'w-component-vue/src/components/WSwitch.vue'
-import WCheckbox from 'w-component-vue/src/components/WCheckbox.vue'
-import WIcon from 'w-component-vue/src/components/WIcon.vue'
-import WButtonChip from 'w-component-vue/src/components/WButtonChip.vue'
 import WButtonCircle from 'w-component-vue/src/components/WButtonCircle.vue'
 import WAggridVueDyn from 'w-component-vue/src/components/WAggridVueDyn.vue'
 
@@ -181,12 +171,6 @@ import WAggridVueDyn from 'w-component-vue/src/components/WAggridVueDyn.vue'
 export default {
     components: {
         WDialog,
-        WText,
-        WTextSuggest,
-        WSwitch,
-        WCheckbox,
-        WIcon,
-        WButtonChip,
         WButtonCircle,
         WAggridVueDyn,
     },
@@ -378,7 +362,7 @@ export default {
                 let kpHead = {
                     'name': vo.$t('grupName'),
                     'pemisNames': vo.$t('belongPemisNames'),
-                    'mode': vo.$t('operEnable'),
+                    'mode': vo.$t('operPemiEnable'),
                     'enable': vo.$t('operMode'),
                 }
 
@@ -576,10 +560,33 @@ export default {
             return rows
         },
 
+        fltKpPemi: function(kp) {
+            // console.log('fltKpPemi', kp)
+
+            let vo = this
+
+            //_kp
+            let _kp = {}
+            each(vo.pemis, (v, k) => {
+                _kp[v.name] = true
+            })
+            // console.log('_kp', _kp)
+
+            //kpt
+            let kpt = {}
+            each(kp, (v, k) => {
+                if (haskey(_kp, k)) {
+                    kpt[k] = v
+                }
+            })
+
+            return kpt
+        },
+
         genItems: function(pemi, grups) {
             // console.log('genItems', pemi, grups)
 
-            // let vo = this
+            let vo = this
 
             //items
             let items = map(grups, (g) => {
@@ -588,6 +595,10 @@ export default {
                 let kpPemi = JSON5.parse(g.cpemis)
                 // console.log(g.name, 'kpPemi', kpPemi)
 
+                //fltKpPemi
+                kpPemi = vo.fltKpPemi(kpPemi)
+                // console.log(g.name, 'kpPemi(fltKpPemi)', kpPemi)
+
                 //mode, enable, pemis
                 let mode = 'OR'
                 let enable = 'n'
@@ -670,6 +681,10 @@ export default {
                 let kpPemi = JSON5.parse(g.cpemis)
                 // console.log(g.name, 'kpPemi', kpPemi)
 
+                //fltKpPemi
+                kpPemi = vo.fltKpPemi(kpPemi)
+                // console.log(g.name, 'kpPemi(fltKpPemi)', kpPemi)
+
                 //mode
                 let mode = get(rows, `${kg}.mode`, '')
                 if (mode !== 'OR' && mode !== 'AND') {

package/src/store/mutations.mjs

@@ -121,10 +121,14 @@ let state = {
             eng: `Enable`,
             cht: `是否使用`,
         },
-        operEnable: {
+        operPemiEnable: {
             eng: `Operator`,
             cht: `合併權限模式`,
         },
+        operGrupEnable: {
+            eng: `Operator`,
+            cht: `合併權限群組模式`,
+        },
 
         processing: {
             eng: `Processing...`,
@@ -318,10 +322,10 @@ let state = {
             eng: `Edit rules of permission`,
             cht: `編輯對象規則清單`,
         },
-        pemiEditCrulesSimple: {
-            eng: `Edit rules`,
-            cht: `編輯對象規則`,
-        },
+        // pemiEditCrulesSimple: {
+        //     eng: `Edit rules`,
+        //     cht: `編輯對象規則`,
+        // },
         pemiEditCrulesNoPemiId: {
             eng: `Can not find the id of permission`,
             cht: `無法找到權限Id`,
@@ -330,6 +334,14 @@ let state = {
             eng: `Can not find the data of permission`,
             cht: `無法找到權限資料`,
         },
+        pemiRnderCrulesNoRule: {
+            eng: `No rule`,
+            cht: `無使用任何對象規則`,
+        },
+        pemiRnderCrulesHasNRule: {
+            eng: `Has {n} rule(s){nms}`,
+            cht: `編輯使用 {n} 項對象規則{nms}`,
+        },
         pemiClearPemisFail: {
             eng: `Failed to clear existing permissions`,
             cht: `清除既有權限數據失敗`,

package/tableTags-web-perm.json

@@ -1 +1 @@
-{"grups":"aFRgBa","pemis":"faUYkW","targets":"KaDgSs","users":"RFFG4C"}
+{"grups":"eyUJB7","pemis":"Jp2FFI","targets":"KXMbz0","users":"mRH4QR"}