w-web-perm 1.0.24 → 1.0.26

package/src/components/VeGrupBlngUsers.vue

@@ -1,14 +1,14 @@
 <template>
     <WDialog
         :show.sync="bShow"
-        :title="$t('grupBlngEditUsers')"
+        :title="isEditable?$t('grupBlngEditUsers'):$t('grupBlngEditUsersForDisplay')"
         :icon="mdiFormatListCheckbox"
         :minWidth="800"
         :maxWidth="800"
         :fullscreen="fullscreen"
         :contentBackgroundColor="'#fff'"
         :headerBtns="useHeaderBtns"
-        :hasSaveBtn="isModified"
+        :hasSaveBtn="isEditable && isModified"
         :save-btn-tooltip="$t('save')"
         :close-btn-tooltip="$t('close')"
         @click-btns="clickBtns"
@@ -20,7 +20,7 @@
             <div>
 
                 <div
-                    style="border-bottom:1px solid #ddd; background:#fff;"
+                    style="_border-bottom:1px solid #ddd; background:#fff;"
                     v-domresize
                     @domresize="resizeHead"
                 >
@@ -39,7 +39,10 @@
                     </div>
 
                     <!-- 功能區 -->
-                    <div style="padding:5px; background:#fff; display:flex; align-items:center;">
+                    <div
+                        style="padding:5px; background:#fff; display:flex; align-items:center;"
+                        v-if="isEditable"
+                    >
 
                         <template>
 
@@ -57,7 +60,7 @@
                                 @click="showVeGrupBlngUsersToggleItemsEnableAllYes"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -77,7 +80,7 @@
                                 @click="showVeGrupBlngUsersToggleItemsEnableAllNo"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -97,7 +100,7 @@
                                 @click="showVeGrupBlngUsersToggleItemsEnableAllInv"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -117,7 +120,7 @@
                                 @click="deleteItemsCheck"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -152,9 +155,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 +162,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 +174,6 @@ import WAggridVueDyn from 'w-component-vue/src/components/WAggridVueDyn.vue'
 export default {
     components: {
         WDialog,
-        WText,
-        WTextSuggest,
-        WSwitch,
-        WCheckbox,
-        WIcon,
-        WButtonChip,
         WButtonCircle,
         WAggridVueDyn,
     },
@@ -213,6 +200,7 @@ export default {
             panelHeight: 100,
             headHeight: 100,
 
+            isEditable: false,
             isModified: false,
 
             grup: null,
@@ -378,7 +366,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'),
                 }
 
@@ -389,13 +377,14 @@ export default {
                     keys: ks,
                     kpHead,
                     autoFitColumn: true,
+                    defCellEditable: false, //vo.isEditable,
                     defHeadFilter: true,
                     defCellAlignH: 'left',
-                    // kpCellEditable: {
-                    //     'name': true,
-                    //     'mode': true,
-                    //     'enable': true,
-                    // },
+                    kpCellEditable: {
+                        'name': vo.isEditable,
+                        'mode': false,
+                        'enable': false,
+                    },
                     kpHeadWidth: {
                         'mode': 100,
                         'enable': 100,
@@ -462,7 +451,7 @@ export default {
                             // console.log('mode', mode, k, r)
 
                             let t = `
-                                <select onchange="$vo.$dg.showVeGrupBlngUsersToggleItemModeByName('${name}',this.value)">
+                                <select onchange="$vo.$dg.showVeGrupBlngUsersToggleItemModeByName('${name}',this.value)" ${vo.isEditable ? '' : 'disabled'}>
                                     <option value="OR" ${mode === 'OR' ? 'selected' : ''}>OR</option>
                                     <option value="AND" ${mode === 'AND' ? 'selected' : ''}>AND</option>
                                 </select>
@@ -478,7 +467,7 @@ export default {
                             // console.log('name', name, k, r)
 
                             let t = `
-                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.showVeGrupBlngUsersToggleItemEnableByName('${name}')" />
+                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.showVeGrupBlngUsersToggleItemEnableByName('${name}')" ${vo.isEditable ? '' : 'disabled'} />
                             `
 
                             return t
@@ -576,10 +565,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 +600,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 +686,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') {
@@ -1103,8 +1123,8 @@ export default {
 
         },
 
-        show: function (grup) {
-            // console.log('methods show', grup)
+        show: function (msg) {
+            // console.log('methods show', msg)
 
             let vo = this
 
@@ -1114,15 +1134,22 @@ export default {
             //default
             vo.isModified = false
 
+            //isEditable, grup
+            let isEditable = get(msg, 'isEditable', false)
+            let grup = get(msg, 'grup', {})
+
             //grup
             grup = cloneDeep(grup)
-            vo.grup = grup
 
             //users
             let users = cloneDeep(vo.users)
 
             //items
             let items = vo.genItems(grup, users)
+
+            //save
+            vo.isEditable = isEditable
+            vo.grup = grup
             vo.items = items
 
             //genOpt

package/src/components/VePemiBlngGrups.vue

@@ -1,14 +1,14 @@
 <template>
     <WDialog
         :show.sync="bShow"
-        :title="$t('pemiBlngEditGrups')"
+        :title="isEditable?$t('pemiBlngEditGrups'):$t('pemiBlngEditGrupsForDisplay')"
         :icon="mdiFormatListCheckbox"
         :minWidth="800"
         :maxWidth="800"
         :fullscreen="fullscreen"
         :contentBackgroundColor="'#fff'"
         :headerBtns="useHeaderBtns"
-        :hasSaveBtn="isModified"
+        :hasSaveBtn="isEditable && isModified"
         :save-btn-tooltip="$t('save')"
         :close-btn-tooltip="$t('close')"
         @click-btns="clickBtns"
@@ -20,7 +20,7 @@
             <div>
 
                 <div
-                    style="border-bottom:1px solid #ddd; background:#fff;"
+                    style="_border-bottom:1px solid #ddd; background:#fff;"
                     v-domresize
                     @domresize="resizeHead"
                 >
@@ -39,7 +39,10 @@
                     </div>
 
                     <!-- 功能區 -->
-                    <div style="padding:5px; background:#fff; display:flex; align-items:center;">
+                    <div
+                        style="padding:5px; background:#fff; display:flex; align-items:center;"
+                        v-if="isEditable"
+                    >
 
                         <template>
 
@@ -57,7 +60,7 @@
                                 @click="showVePemiBlngGrupsToggleItemsEnableAllYes"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -77,7 +80,7 @@
                                 @click="showVePemiBlngGrupsToggleItemsEnableAllNo"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -97,7 +100,7 @@
                                 @click="showVePemiBlngGrupsToggleItemsEnableAllInv"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -117,7 +120,7 @@
                                 @click="deleteItemsCheck"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -152,9 +155,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 +162,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 +174,6 @@ import WAggridVueDyn from 'w-component-vue/src/components/WAggridVueDyn.vue'
 export default {
     components: {
         WDialog,
-        WText,
-        WTextSuggest,
-        WSwitch,
-        WCheckbox,
-        WIcon,
-        WButtonChip,
         WButtonCircle,
         WAggridVueDyn,
     },
@@ -213,6 +200,7 @@ export default {
             panelHeight: 100,
             headHeight: 100,
 
+            isEditable: false,
             isModified: false,
 
             pemi: null,
@@ -378,7 +366,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'),
                 }
 
@@ -389,13 +377,14 @@ export default {
                     keys: ks,
                     kpHead,
                     autoFitColumn: true,
+                    defCellEditable: false, //vo.isEditable,
                     defHeadFilter: true,
                     defCellAlignH: 'left',
-                    // kpCellEditable: {
-                    //     'name': true,
-                    //     'mode': true,
-                    //     'enable': true,
-                    // },
+                    kpCellEditable: {
+                        'name': vo.isEditable,
+                        'mode': false,
+                        'enable': false,
+                    },
                     kpHeadWidth: {
                         'mode': 100,
                         'enable': 100,
@@ -462,7 +451,7 @@ export default {
                             // console.log('mode', mode, k, r)
 
                             let t = `
-                                <select onchange="$vo.$dg.showVePemiBlngGrupsToggleItemModeByName('${name}',this.value)">
+                                <select onchange="$vo.$dg.showVePemiBlngGrupsToggleItemModeByName('${name}',this.value)" ${vo.isEditable ? '' : 'disabled'}>
                                     <option value="OR" ${mode === 'OR' ? 'selected' : ''}>OR</option>
                                     <option value="AND" ${mode === 'AND' ? 'selected' : ''}>AND</option>
                                 </select>
@@ -478,7 +467,7 @@ export default {
                             // console.log('name', name, k, r)
 
                             let t = `
-                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.showVePemiBlngGrupsToggleItemEnableByName('${name}')" />
+                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.showVePemiBlngGrupsToggleItemEnableByName('${name}')" ${vo.isEditable ? '' : 'disabled'} />
                             `
 
                             return t
@@ -576,10 +565,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 +600,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 +686,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') {
@@ -1103,8 +1123,8 @@ export default {
 
         },
 
-        show: function (pemi) {
-            // console.log('methods show', pemi)
+        show: function (msg) {
+            // console.log('methods show', msg)
 
             let vo = this
 
@@ -1114,15 +1134,22 @@ export default {
             //default
             vo.isModified = false
 
+            //isEditable, pemi
+            let isEditable = get(msg, 'isEditable', false)
+            let pemi = get(msg, 'pemi', {})
+
             //grup
             pemi = cloneDeep(pemi)
-            vo.pemi = pemi
 
             //grups
             let grups = cloneDeep(vo.grups)
 
             //items
             let items = vo.genItems(pemi, grups)
+
+            //save
+            vo.isEditable = isEditable
+            vo.pemi = pemi
             vo.items = items
 
             //genOpt

package/src/schema/tables/pemis.mjs

@@ -35,7 +35,7 @@ let settings = {
         type: 'STRING',
     },
     crules: {
-        name: '管控對象規則清單', //為json字串
+        name: '管控對象清單', //為json字串
         type: 'TEXT',
     },
     userId: {