w-web-perm 1.0.25 → 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>
 
@@ -197,6 +200,7 @@ export default {
             panelHeight: 100,
             headHeight: 100,
 
+            isEditable: false,
             isModified: false,
 
             grup: null,
@@ -373,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,
@@ -446,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>
@@ -462,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
@@ -1118,8 +1123,8 @@ export default {
 
         },
 
-        show: function (grup) {
-            // console.log('methods show', grup)
+        show: function (msg) {
+            // console.log('methods show', msg)
 
             let vo = this
 
@@ -1129,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>
 
@@ -197,6 +200,7 @@ export default {
             panelHeight: 100,
             headHeight: 100,
 
+            isEditable: false,
             isModified: false,
 
             pemi: null,
@@ -373,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,
@@ -446,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>
@@ -462,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
@@ -1118,8 +1123,8 @@ export default {
 
         },
 
-        show: function (pemi) {
-            // console.log('methods show', pemi)
+        show: function (msg) {
+            // console.log('methods show', msg)
 
             let vo = this
 
@@ -1129,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: {

package/src/store/mutations.mjs

@@ -163,6 +163,15 @@ let state = {
         //     eng: `No description`,
         //     cht: `無說明`,
         // },
+        modeEdit: {
+            eng: `Edit mode`,
+            cht: `編輯模式`,
+        },
+        showTabCols: {
+            eng: `Show columns`,
+            cht: `顯示欄位`,
+        },
+
         belongUsers: {
             eng: `Use users`,
             cht: `管控所屬使用者`,
@@ -183,6 +192,7 @@ let state = {
             eng: `Use permissions`,
             cht: `所屬權限名稱`,
         },
+
         isAdmin: {
             eng: `Administrator`,
             cht: `是否為系統管理員`,
@@ -201,10 +211,23 @@ let state = {
             cht: `Email出現錯誤待修復`,
         },
 
+        menuTreeShow: {
+            eng: `Show menu`,
+            cht: `顯示選單`,
+        },
+        menuTreeHide: {
+            eng: `Hide menu`,
+            cht: `隱藏選單`,
+        },
+
         managementTargets: {
             eng: `Targets`,
             cht: `管理對象`,
         },
+        managementTargetsMsg: {
+            eng: `Targets generally refer to entities such as pages, data, etc., and can also include features or services.`,
+            cht: `對象泛指實體的頁面、數據等，亦可為的功能或服務。`,
+        },
         targetId: {
             eng: `Target`,
             cht: `對象名稱`,
@@ -266,6 +289,10 @@ let state = {
             eng: `Permissions`,
             cht: `管理權限`,
         },
+        managementPemisMsg: {
+            eng: `Permissions are primarily used to set rules for enabling or disabling various objects.`,
+            cht: `權限主要為用來設定各種對象之使用或禁用規則。`,
+        },
         pemiName: {
             eng: `Name of permission`,
             cht: `權限名稱`,
@@ -308,7 +335,7 @@ let state = {
         },
         pemiCrules: {
             eng: `Rules of permission`,
-            cht: `管控對象規則`,
+            cht: `管控對象`,
         },
         pemiEditBlngGrupsNoPemiId: {
             eng: `Can not find the id of permission`,
@@ -320,11 +347,15 @@ let state = {
         },
         pemiEditCrules: {
             eng: `Edit rules of permission`,
-            cht: `編輯對象規則清單`,
+            cht: `編輯使用對象`,
+        },
+        pemiEditCrulesForDisplay: {
+            eng: `Rules of permission`,
+            cht: `展示使用對象`,
         },
         // pemiEditCrulesSimple: {
         //     eng: `Edit rules`,
-        //     cht: `編輯對象規則`,
+        //     cht: `編輯對象`,
         // },
         pemiEditCrulesNoPemiId: {
             eng: `Can not find the id of permission`,
@@ -336,11 +367,11 @@ let state = {
         },
         pemiRnderCrulesNoRule: {
             eng: `No rule`,
-            cht: `無使用任何對象規則`,
+            cht: `無使用任何對象`,
         },
         pemiRnderCrulesHasNRule: {
             eng: `Has {n} rule(s){nms}`,
-            cht: `編輯使用 {n} 項對象規則{nms}`,
+            cht: `使用共 {n} 項對象{nms}`,
         },
         pemiClearPemisFail: {
             eng: `Failed to clear existing permissions`,
@@ -359,6 +390,10 @@ let state = {
             eng: `Edit permission groups`,
             cht: `編輯所屬權限群組`,
         },
+        pemiBlngEditGrupsForDisplay: {
+            eng: `Permission groups`,
+            cht: `展示所屬權限群組`,
+        },
         pemiBlngRnderNoGrup: {
             eng: `No users`,
             cht: `無所屬權限群組`,
@@ -401,6 +436,10 @@ let state = {
             eng: `Permission groups`,
             cht: `管理權限群組`,
         },
+        managementGrupsMsg: {
+            eng: `Permission groups are primarily used to configure combinations of different permissions.`,
+            cht: `權限群組主要為用來設定組合各種權限。`,
+        },
         grupName: {
             eng: `Name of permission group`,
             cht: `權限群組名稱`,
@@ -455,7 +494,11 @@ let state = {
         },
         grupEditCpemis: {
             eng: `Edit list of permission group`,
-            cht: `編輯使用權限清單`,
+            cht: `編輯使用權限`,
+        },
+        grupEditCpemisForDisplay: {
+            eng: `List of permission group`,
+            cht: `展示使用權限`,
         },
         grupRnderCpemisNoPermission: {
             eng: `No permission`,
@@ -463,7 +506,7 @@ let state = {
         },
         grupRnderCpemisHasNPermissions: {
             eng: `Has {n} permission(s){nms}`,
-            cht: `編輯使用 {n} 項權限{nms}`,
+            cht: `使用 {n} 項權限{nms}`,
         },
         grupClearGrupsFail: {
             eng: `Failed to clear existing permission groups`,
@@ -486,6 +529,10 @@ let state = {
             eng: `Edit permission group of users`,
             cht: `編輯所屬使用者`,
         },
+        grupBlngEditUsersForDisplay: {
+            eng: `Permission group of users`,
+            cht: `展示所屬使用者`,
+        },
         grupBlngRnderNoUser: {
             eng: `No users`,
             cht: `無所屬使用者`,
@@ -528,6 +575,10 @@ let state = {
             eng: `Users`,
             cht: `管理使用者`,
         },
+        managementUsersMsg: {
+            eng: `Users are primarily for providing or extending user information and can be configured with combinations of various permission groups.`,
+            cht: `使用者主要為提供或擴充使用者資訊，並可設定組合各種權限群組。`,
+        },
         userName: {
             eng: `Name of user`,
             cht: `使用者名稱`,
@@ -582,7 +633,11 @@ let state = {
         },
         userEditCgrups: {
             eng: `Edit list of user`,
-            cht: `編輯使用權限群組清單`,
+            cht: `編輯使用權限群組`,
+        },
+        userEditCgrupsForDisplay: {
+            eng: `Edit list of user`,
+            cht: `展示使用權限群組`,
         },
         userEditCgrupsNoUserId: {
             eng: `Can not find the id of user`,
@@ -622,7 +677,7 @@ let state = {
         },
         userRnderCgrupsHasNGroups: {
             eng: `Has {n} permission group(s){nms}`,
-            cht: `編輯使用 {n} 項權限群組{nms}`,
+            cht: `使用 {n} 項權限群組{nms}`,
         },
 
         cgrupEditNoName: {

package/srv.mjs

@@ -17,6 +17,14 @@ let opt = {
     serverPort: 11006,
     subfolder: '', //mperm
     urlRedirect: 'https://www.google.com/', //本機測試時得先編譯, 再瀏覽: http://localhost:11006/
+    showModeEditTargets: 'y', //'n',
+    showModeEditPemis: 'y',
+    showModeEditGrups: 'y',
+    showModeEditUsers: 'y',
+    modeEditTargets: 'y', //'n',
+    modeEditPemis: 'y',
+    modeEditGrups: 'y',
+    modeEditUsers: 'y',
 
     webName: {
         'eng': 'Permission Service',
@@ -24,7 +32,7 @@ let opt = {
     },
     webDescription: {
         'eng': 'A web service package for user permissions and management targets.',
-        'cht': 'A web service package for user permissions and management targets.',
+        'cht': '基於簡易分層架構來給予與設定使用者所需之權限及群組管理功能',
     },
     webLogo: 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjQ4IiB3aWR0aD0iNDgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTQ4IDBIMHY0OGg0OFYwWiIgZmlsbD0iI2ZmZiIgZmlsbC1vcGFjaXR5PSIuMDEiLz48cGF0aCBkPSJNMzcuODU2IDIwdjhNMjcuNDY0IDM4bDMuNDY0LTIgMy40NjQtMk0yMC41MzYgMzhsLTMuNDY1LTItMy40NjQtMk0xMC4xNDQgMjB2OE0xMy42MDcgMTRsMy40NjUtMiAzLjQ2NC0yTTI3LjQ2NCAxMGwzLjQ2NCAyIDMuNDY0IDIiIHN0cm9rZT0iI0ZGOTgwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjIiLz48cGF0aCBkPSJNMjQgNDRhNCA0IDAgMSAwIDAtOCA0IDQgMCAwIDAgMCA4Wk0yNCAxMmE0IDQgMCAxIDAgMC04IDQgNCAwIDAgMCAwIDhaTTI0IDI4YTQgNCAwIDEgMCAwLTggNCA0IDAgMCAwIDAgOFpNMzggMjBhNCA0IDAgMSAwIDAtOCA0IDQgMCAwIDAgMCA4Wk0zOCAzNmE0IDQgMCAxIDAgMC04IDQgNCAwIDAgMCAwIDhaTTEwIDIwYTQgNCAwIDEgMCAwLTggNCA0IDAgMCAwIDAgOFpNMTAgMzZhNCA0IDAgMSAwIDAtOCA0IDQgMCAwIDAgMCA4WiIgZmlsbD0iI0ZGRTBCMiIgc3Ryb2tlPSIjRkY5ODAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHN0cm9rZS13aWR0aD0iMiIvPjwvc3ZnPg==',
 

package/tableTags-web-perm.json

@@ -1 +1 @@
-{"grups":"eyUJB7","pemis":"Jp2FFI","targets":"KXMbz0","users":"mRH4QR"}
+{"grups":"eTl8uq","pemis":"kB3ULB","targets":"SO2G1L","users":"2ocEzg"}