w-web-perm 1.0.25 → 1.0.26

package/src/components/VeCgrups.vue

@@ -1,14 +1,14 @@
 <template>
     <WDialog
         :show.sync="bShow"
-        :title="$t('userEditCgrups')"
+        :title="isEditable?$t('userEditCgrups'):$t('userEditCgrupsForDisplay')"
         :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,13 +20,16 @@
             <div>
 
                 <div
-                    style="border-bottom:1px solid #ddd; background:#fff;"
+                    style="_border-bottom:1px solid #ddd; background:#fff;"
                     v-domresize
                     @domresize="resizeHead"
                 >
 
                     <!-- 功能區 -->
-                    <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>
 
@@ -44,7 +47,7 @@
                                 @click="showVeCgrupsToggleItemsEnableAllYes"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -64,7 +67,7 @@
                                 @click="showVeCgrupsToggleItemsEnableAllNo"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -84,7 +87,7 @@
                                 @click="showVeCgrupsToggleItemsEnableAllInv"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -104,7 +107,7 @@
                                 @click="deleteItemsCheck"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -139,26 +142,15 @@ 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'
 import sortBy from 'lodash-es/sortBy.js'
 import cloneDeep from 'lodash-es/cloneDeep.js'
 import genPm from 'wsemi/src/genPm.mjs'
-import sep from 'wsemi/src/sep.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'
 
@@ -166,12 +158,6 @@ import WAggridVueDyn from 'w-component-vue/src/components/WAggridVueDyn.vue'
 export default {
     components: {
         WDialog,
-        WText,
-        WTextSuggest,
-        WSwitch,
-        WCheckbox,
-        WIcon,
-        WButtonChip,
         WButtonCircle,
         WAggridVueDyn,
     },
@@ -198,6 +184,7 @@ export default {
             panelHeight: 100,
             headHeight: 100,
 
+            isEditable: false,
             isModified: false,
 
             user: null,
@@ -364,13 +351,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,
@@ -407,7 +395,7 @@ export default {
                             // console.log('mode', mode, k, r)
 
                             let t = `
-                                <select onchange="$vo.$dg.showVeCgrupsToggleItemModeByName('${name}',this.value)">
+                                <select onchange="$vo.$dg.showVeCgrupsToggleItemModeByName('${name}',this.value)" ${vo.isEditable ? '' : 'disabled'}>
                                     <option value="OR" ${mode === 'OR' ? 'selected' : ''}>OR</option>
                                     <option value="AND" ${mode === 'AND' ? 'selected' : ''}>AND</option>
                                 </select>
@@ -423,7 +411,7 @@ export default {
                             // console.log('name', name, k, r)
 
                             let t = `
-                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.showVeCgrupsToggleItemEnableByName('${name}')" />
+                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.showVeCgrupsToggleItemEnableByName('${name}')" ${vo.isEditable ? '' : 'disabled'} />
                             `
 
                             return t
@@ -838,8 +826,8 @@ export default {
 
         },
 
-        show: function (user) {
-            // console.log('methods show', user)
+        show: function (msg) {
+            // console.log('methods show', msg)
 
             let vo = this
 
@@ -849,6 +837,10 @@ export default {
             //default
             vo.isModified = false
 
+            //isEditable, user
+            let isEditable = get(msg, 'isEditable', false)
+            let user = get(msg, 'user', {})
+
             //cloneDeep
             user = cloneDeep(user)
 
@@ -906,6 +898,7 @@ export default {
             // console.log('items', items)
 
             //save
+            vo.isEditable = isEditable
             vo.user = user
             vo.items = items
 

package/src/components/VeCpemis.vue

@@ -1,14 +1,14 @@
 <template>
     <WDialog
         :show.sync="bShow"
-        :title="$t('grupEditCpemis')"
+        :title="isEditable?$t('grupEditCpemis'):$t('grupEditCpemisForDisplay')"
         :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,13 +20,16 @@
             <div>
 
                 <div
-                    style="border-bottom:1px solid #ddd; background:#fff;"
+                    style="_border-bottom:1px solid #ddd; background:#fff;"
                     v-domresize
                     @domresize="resizeHead"
                 >
 
                     <!-- 功能區 -->
-                    <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>
 
@@ -44,7 +47,7 @@
                                 @click="showVeCpemisToggleItemsEnableAllYes"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -64,7 +67,7 @@
                                 @click="showVeCpemisToggleItemsEnableAllNo"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -84,7 +87,7 @@
                                 @click="showVeCpemisToggleItemsEnableAllInv"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -104,7 +107,7 @@
                                 @click="deleteItemsCheck"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -139,26 +142,15 @@ 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'
 import sortBy from 'lodash-es/sortBy.js'
 import cloneDeep from 'lodash-es/cloneDeep.js'
 import genPm from 'wsemi/src/genPm.mjs'
-import sep from 'wsemi/src/sep.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'
 
@@ -166,12 +158,6 @@ import WAggridVueDyn from 'w-component-vue/src/components/WAggridVueDyn.vue'
 export default {
     components: {
         WDialog,
-        WText,
-        WTextSuggest,
-        WSwitch,
-        WCheckbox,
-        WIcon,
-        WButtonChip,
         WButtonCircle,
         WAggridVueDyn,
     },
@@ -198,6 +184,7 @@ export default {
             panelHeight: 100,
             headHeight: 100,
 
+            isEditable: false,
             isModified: false,
 
             grup: null,
@@ -364,13 +351,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,
@@ -407,7 +395,7 @@ export default {
                             // console.log('mode', mode, k, r)
 
                             let t = `
-                                <select onchange="$vo.$dg.showVeCpemisToggleItemModeByName('${name}',this.value)">
+                                <select onchange="$vo.$dg.showVeCpemisToggleItemModeByName('${name}',this.value)" ${vo.isEditable ? '' : 'disabled'}>
                                     <option value="OR" ${mode === 'OR' ? 'selected' : ''}>OR</option>
                                     <option value="AND" ${mode === 'AND' ? 'selected' : ''}>AND</option>
                                 </select>
@@ -423,7 +411,7 @@ export default {
                             // console.log('name', name, k, r)
 
                             let t = `
-                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.showVeCpemisToggleItemEnableByName('${name}')" />
+                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.showVeCpemisToggleItemEnableByName('${name}')" ${vo.isEditable ? '' : 'disabled'} />
                             `
 
                             return t
@@ -838,8 +826,8 @@ export default {
 
         },
 
-        show: function (grup) {
-            // console.log('methods show', grup)
+        show: function (msg) {
+            // console.log('methods show', msg)
 
             let vo = this
 
@@ -849,6 +837,10 @@ export default {
             //default
             vo.isModified = false
 
+            //isEditable, grup
+            let isEditable = get(msg, 'isEditable', false)
+            let grup = get(msg, 'grup', {})
+
             //cloneDeep
             grup = cloneDeep(grup)
 
@@ -906,6 +898,7 @@ export default {
             // console.log('items', items)
 
             //save
+            vo.isEditable = isEditable
             vo.grup = grup
             vo.items = items
 

package/src/components/VeCrules.vue

@@ -1,14 +1,14 @@
 <template>
     <WDialog
         :show.sync="bShow"
-        :title="$t('pemiEditCrules')"
+        :title="isEditable?$t('pemiEditCrules'):$t('pemiEditCrulesForDisplay')"
         :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,13 +20,16 @@
             <div>
 
                 <div
-                    style="border-bottom:1px solid #ddd; background:#fff;"
+                    style="_border-bottom:1px solid #ddd; background:#fff;"
                     v-domresize
                     @domresize="resizeHead"
                 >
 
                     <!-- 功能區 -->
-                    <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>
 
@@ -44,7 +47,7 @@
                                 @click="toggleItemsEnableAllYes"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -64,7 +67,7 @@
                                 @click="toggleItemsEnableAllNo"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -84,7 +87,7 @@
                                 @click="toggleItemsEnableAllInv"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -104,7 +107,7 @@
                                 @click="deleteItemsCheck"
                             ></WButtonCircle>
 
-                            <div style="padding-left:6px;"></div>
+                            <div style="padding-left:4px;"></div>
 
                         </template>
 
@@ -139,25 +142,15 @@ 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 size from 'lodash-es/size.js'
 import filter from 'lodash-es/filter.js'
-import join from 'lodash-es/join.js'
 import sortBy from 'lodash-es/sortBy.js'
 import cloneDeep from 'lodash-es/cloneDeep.js'
 import genPm from 'wsemi/src/genPm.mjs'
-import sep from 'wsemi/src/sep.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'
 
@@ -165,12 +158,6 @@ import WAggridVueDyn from 'w-component-vue/src/components/WAggridVueDyn.vue'
 export default {
     components: {
         WDialog,
-        WText,
-        WTextSuggest,
-        WSwitch,
-        WCheckbox,
-        WIcon,
-        WButtonChip,
         WButtonCircle,
         WAggridVueDyn,
     },
@@ -197,6 +184,7 @@ export default {
             panelHeight: 100,
             headHeight: 100,
 
+            isEditable: false,
             isModified: false,
 
             pemi: null,
@@ -360,12 +348,13 @@ export default {
                     keys: ks,
                     kpHead,
                     autoFitColumn: true,
+                    defCellEditable: false, //vo.isEditable,
                     defHeadFilter: true,
                     defCellAlignH: 'left',
-                    // kpCellEditable: {
-                    //     'id': true,
-                    //     'enable': true,
-                    // },
+                    kpCellEditable: {
+                        'id': vo.isEditable,
+                        'enable': false,
+                    },
                     kpHeadWidth: {
                         'enable': 50,
                     },
@@ -396,7 +385,7 @@ export default {
                             // console.log('id', id, k, r)
 
                             let t = `
-                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.toggleItemEnableById('${id}')" />
+                                <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.toggleItemEnableById('${id}')" ${vo.isEditable ? '' : 'disabled'} />
                             `
 
                             return t
@@ -756,8 +745,8 @@ export default {
 
         },
 
-        show: function (pemi) {
-            // console.log('methods show', pemi)
+        show: function (msg) {
+            // console.log('methods show', msg)
 
             let vo = this
 
@@ -767,6 +756,10 @@ export default {
             //default
             vo.isModified = false
 
+            //isEditable, pemi
+            let isEditable = get(msg, 'isEditable', false)
+            let pemi = get(msg, 'pemi', {})
+
             //cloneDeep
             pemi = cloneDeep(pemi)
 
@@ -800,6 +793,7 @@ export default {
             // console.log('items', items)
 
             //save
+            vo.isEditable = isEditable
             vo.pemi = pemi
             vo.items = items