w-web-perm 1.0.4 → 1.0.5

package/src/components/ruleGroup.vue

@@ -18,7 +18,7 @@
 
                 <div style="padding:5px 0px; display:flex; align-items:center;">
                     <div style="padding-right:5px; font-size:0.9rem; color:#888;">
-                        名稱:
+                        {{$t('name')}}:
                     </div>
                     <div style="">
                         <WText
@@ -31,7 +31,7 @@
 
                 <div style="padding:5px 0px; display:flex; align-items:center;">
                     <div style="padding-right:5px; font-size:0.9rem; color:#888;">
-                        說明:
+                        {{$t('description')}}:
                     </div>
                     <div style="">
                         <WText
@@ -64,10 +64,10 @@
                 v-if="false"
             >
 
-                <div style="margin-right:10px;">全部項目預設值：</div>
+                <div style="margin-right:10px;">{{$t('allDefaults')}}:</div>
 
                 <div style="margin-right:10px; display:flex; align-items:center;">
-                    <div style="margin-right:5px;">顯示</div>
+                    <div style="margin-right:5px;">{{$t('show')}}</div>
                     <div>
                         <WSwitch
                             :value="defaultShow"
@@ -77,7 +77,7 @@
                 </div>
 
                 <div style="margin-right:10px; display:flex; align-items:center;">
-                    <div style="margin-right:5px;">啟用</div>
+                    <div style="margin-right:5px;">{{$t('active')}}</div>
                     <div>
                         <WSwitch
                             :value="defaultActive"
@@ -115,7 +115,7 @@
                             :iconSize="18"
                             :paddingStyle="{v:4,h:4}"
                             :shadow="false"
-                            :tooltip="'所屬顯示'"
+                            :tooltip="$t('showChildren')"
                             :backgroundColor="'rgba(200,200,200,0.2)'"
                             :backgroundColorHover="'rgba(255,150,100,0.2)'"
                             :backgroundColorFocus="'rgba(255,150,100,0.2)'"
@@ -130,7 +130,7 @@
                             :iconSize="18"
                             :paddingStyle="{v:4,h:4}"
                             :shadow="false"
-                            :tooltip="'所屬不顯示'"
+                            :tooltip="$t('hideChildren')"
                             :backgroundColor="'rgba(200,200,200,0.2)'"
                             :backgroundColorHover="'rgba(255,150,100,0.2)'"
                             :backgroundColorFocus="'rgba(255,150,100,0.2)'"
@@ -145,7 +145,7 @@
                             :iconSize="18"
                             :paddingStyle="{v:4,h:4}"
                             :shadow="false"
-                            :tooltip="'所屬啟用'"
+                            :tooltip="$t('activateChildren')"
                             :backgroundColor="'rgba(200,200,200,0.2)'"
                             :backgroundColorHover="'rgba(255,150,100,0.2)'"
                             :backgroundColorFocus="'rgba(255,150,100,0.2)'"
@@ -160,7 +160,7 @@
                             :iconSize="18"
                             :paddingStyle="{v:4,h:4}"
                             :shadow="false"
-                            :tooltip="'所屬不啟用'"
+                            :tooltip="$t('deactivateChildren')"
                             :backgroundColor="'rgba(200,200,200,0.2)'"
                             :backgroundColorHover="'rgba(255,150,100,0.2)'"
                             :backgroundColorFocus="'rgba(255,150,100,0.2)'"
@@ -174,7 +174,7 @@
 
                     <div style="margin-left:10px; display:inline-block;">
                         <div style="display:flex; align-items:center;">
-                            <div style="margin-right:3px; font-size:0.8rem;">顯示</div>
+                            <div style="margin-right:3px; font-size:0.8rem;">{{$t('show')}}</div>
                             <WCheckbox
                                 :checkedIconColor="'yellow darken-4'"
                                 :uncheckedIconColor="'yellow darken-4'"
@@ -187,7 +187,7 @@
 
                     <div style="margin-left:10px; display:inline-block;">
                         <div style="display:flex; align-items:center;">
-                            <div style="margin-right:3px; font-size:0.8rem;">啟用</div>
+                            <div style="margin-right:3px; font-size:0.8rem;">{{$t('active')}}</div>
                             <WCheckbox
                                 :checkedIconColor="'yellow darken-4'"
                                 :uncheckedIconColor="'yellow darken-4'"

package/src/main.js

@@ -7,7 +7,6 @@ import domResize from 'w-component-vue/src/js/domResize.mjs'
 import domDragDrop from 'w-component-vue/src/js/domDragDrop.mjs'
 import App from './App.vue'
 import store from './store/index.mjs'
-import mVuetify from './plugins/mVuetify.mjs'
 import ui from './plugins/mUI.mjs'
 import mDataSelectorSchema from './plugins/mDataSelectorSchema.mjs'
 // import mDataSupport from './plugins/mDataSupport.mjs'
@@ -91,7 +90,6 @@ WServHapiClient({
 
 //new
 new Vue({
-    vuetify: mVuetify,
     store,
     render: h => h(App)
 }).$mount('#app')

package/src/schema/tables/ruleGroups.mjs

@@ -18,24 +18,24 @@ let settings = {
         name: '主鍵',
         type: 'STRING',
     },
-    name: {
-        name: '名稱',
-        type: 'STRING',
-    },
     order: {
         name: '順序',
         type: 'INTEGER',
     },
-    // type: { //可依照type分組
-    //     name: '類別',
-    //     type: 'STRING',
-    // },
+    name: {
+        name: '名稱',
+        type: 'STRING',
+    },
     description: {
         name: '說明',
         type: 'TEXT',
     },
+    from: {
+        name: '來源',
+        type: 'STRING',
+    },
     crules: {
-        name: '規則', //為json字串, 例如{ '___all___': {show:'y',active:'n'}, '專案A.頁A': {show:'y',active:'y'}, '專案A.頁B': {show:'n',active:'n'} }
+        name: '規則', //為json字串, 例如{ '___all___': {show:'y',active:'n'}, '專案A/頁A': {show:'y',active:'y'}, '專案A/頁B': {show:'n',active:'n'} }
         type: 'TEXT',
     },
     userId: {
@@ -68,15 +68,15 @@ let funNew = (ndata = {}) => {
 
 let funTest = () => {
     let rs = [
-        ['權限群組1', `{ "___all___": { "show": "y", "active": "n" }, "專案A.頁A": { "show": "y", "active": "y" }, "專案A.頁B": { "show": "n", "active": "n" } }`],
+        ['權限群組1', `{ "___all___": { "show": "y", "active": "n" }, "專案A/頁A": { "show": "y", "active": "y" }, "專案A/頁B": { "show": "n", "active": "n" } }`],
         ['權限群組2', `{ "___all___": { "show": "y", "active": "n" } }`],
         ['權限群組3', `{ "___all___": { "show": "y", "active": "y" } }`],
     ]
     rs = map(rs, ([g, crules], k) => {
         let v = funNew({ userId: 'id-for-admin', crules })
         v.id = `id-for-${g}`
-        v.name = g
         v.order = k
+        v.name = g
         v.description = `${g}的說明`
         v = dtpick(v, keys(settings))
         return v

package/src/schema/tables/targets.mjs

@@ -22,18 +22,14 @@ let settings = {
         name: '順序',
         type: 'INTEGER',
     },
-    // key: {
-    //     name: '所屬區塊識別鍊',
-    //     type: 'STRING',
-    // },
-    // name: {
-    //     name: '區塊名稱',
-    //     type: 'STRING',
-    // },
     description: {
         name: '說明',
         type: 'TEXT',
     },
+    from: {
+        name: '來源',
+        type: 'STRING',
+    },
 }
 
 let funNew = (ndata = {}) => {
@@ -71,7 +67,8 @@ let funTest = () => {
     ]
     rs = map(rs, (key, k) => {
         let v = funNew({ description: key })
-        v.id = `id-for-${key}`
+        v.id = key
+        v.order = k
         v = dtpick(v, keys(settings))
         return v
     })

package/src/schema/tables/users.mjs

@@ -18,6 +18,10 @@ let settings = {
         name: '主鍵',
         type: 'STRING',
     },
+    order: {
+        name: '順序',
+        type: 'INTEGER',
+    },
     name: {
         name: '姓名',
         type: 'STRING',
@@ -38,10 +42,6 @@ let settings = {
         name: '所屬權限群組主鍵', //多主鍵用分號區隔
         type: 'STRING',
     },
-    isVirtual: {
-        name: '是否為虛擬使用者', //代表由外部系統(如SSO或AD)提供之使用者
-        type: 'STRING',
-    },
     isAdmin: {
         name: '是否為系統管理員',
         type: 'STRING',
@@ -71,7 +71,6 @@ let settings = {
 let funNew = (ndata = {}) => {
     let o = dtmapping(ndata, keys(settings))
     o.id = `${now2strp()}-${genID()}`
-    o.isVirtual = 'n'
     o.isAdmin = 'n'
     o.userIdUpdate = o.userId
     o.timeCreate = nowms2str()
@@ -92,6 +91,7 @@ let funTest = () => {
     rs = map(rs, (name, k) => {
         let v = funNew({ userId: 'id-for-admin', name })
         v.id = `id-for-${name}`
+        v.order = k
         v.email = `${name}@example.com`
         v = dtpick(v, keys(settings))
         return v

package/src/store/mutations.mjs

@@ -10,7 +10,6 @@ let userDef = {
     id: '', //id-for-admin
     name: '', //測試者
     email: '', //admin@example.com
-    // isVirtual: 'n',
     isAdmin: 'n',
     // isActive: 'n',
 }
@@ -41,83 +40,339 @@ let state = {
     lang: 'cht',
     keyLangs: {
 
+        systemMessage: {
+            eng: 'System message',
+            cht: '系統確認訊息',
+        },
+        ok: {
+            eng: 'OK',
+            cht: '確認',
+        },
+        no: {
+            eng: 'No',
+            cht: '取消',
+        },
+        yes: {
+            eng: 'Yes',
+            cht: '確定',
+        },
+
         empty: {
             eng: 'Empty',
             cht: '無',
         },
-        // noSelectApi: {
-        //     eng: 'No Select',
-        //     cht: '尚未選擇API',
-        // },
         waitingData: {
             eng: 'Waiting data...',
             cht: '等待數據中...',
         },
-        tokens: {
-            eng: 'Tokens',
-            cht: '授權金鑰',
-        },
-        version: {
-            eng: 'Version',
-            cht: '版本',
-        },
-        levels: {
-            eng: 'Levels',
-            cht: '所屬階層',
-        },
-        keywords: {
-            eng: 'Keywords',
-            cht: '關鍵字',
-        },
-        state: {
-            eng: 'State',
-            cht: '狀態',
-        },
-        // timeCreate: {
-        //     eng: 'Create time',
-        //     cht: '創建時間',
-        // },
-        // timeUpdate: {
-        //     eng: 'Update time',
-        //     cht: '更新時間',
-        // },
-        // creator: {
-        //     eng: 'Creator',
-        //     cht: 'API創建者',
-        // },
-        // dataSource: {
-        //     eng: 'Source',
-        //     cht: '資料提供者',
-        // },
+
+        isEditabled: {
+            eng: 'Editable',
+            cht: '是否編輯',
+        },
+        saveChanges: {
+            eng: `Save changes`,
+            cht: `儲存變更`,
+        },
+        from: {
+            eng: `From`,
+            cht: `來源`,
+        },
+        save: {
+            eng: `Save`,
+            cht: `儲存`,
+        },
+        close: {
+            eng: `Close`,
+            cht: `關閉`,
+        },
+        cancel: {
+            eng: `Cancel`,
+            cht: `取消`,
+        },
+        processing: {
+            eng: `Processing...`,
+            cht: `處理中請稍後...`,
+        },
+        anUnexpectedErrorOccurred: {
+            eng: `An unexpected error occurred, please contact the administrator`,
+            cht: `發生非預期錯誤，請洽管理員`,
+        },
+        unknow: {
+            eng: `Unknow`,
+            cht: `未知`,
+        },
+
+        username: {
+            eng: `Username`,
+            cht: `使用者姓名`,
+        },
+        email: {
+            eng: `Email`,
+            cht: `電子郵件`,
+        },
+        name: {
+            eng: `Name`,
+            cht: `名稱`,
+        },
+        description: {
+            eng: `Description`,
+            cht: `說明`,
+        },
+        noDescription: {
+            eng: `No description`,
+            cht: `無說明`,
+        },
+
+        managementTargets: {
+            eng: `Targets`,
+            cht: `管理區塊`,
+        },
+        permissionGroups: {
+            eng: `Groups`,
+            cht: `權限群組`,
+        },
+        userPermissions: {
+            eng: 'Users',
+            cht: '使用者權限',
+        },
+
+        userMsg1: {
+            eng: `Please give the appropriate permission group according to the user's identity.`,
+            cht: '請依照使用者身份給予適合之權限群組。',
+        },
+        userMsg2: {
+            eng: `Please confirm that the new user is an approved user.`,
+            cht: `請確認新增使用者為核可之使用者。`,
+        },
+        userList: {
+            eng: `User list`,
+            cht: `使用者分類清單`,
+        },
+        addUser: {
+            eng: `Add user`,
+            cht: `新增使用者`,
+        },
+
+        targetMsg1: {
+            eng: `Please click the button on the right side of each target to perform operations, such as changing the name, inserting or deleting targets.`,
+            cht: `請於各區塊右側點擊按鈕即可進行操作，例如變更名稱、插入或刪除區塊。`,
+        },
+        targetMsg2: {
+            eng: `Disable the sub-target function when editing a target.`,
+            cht: `編輯區塊時禁止顯隱子區塊功能。`,
+        },
+        edit: {
+            eng: `Edit`,
+            cht: `編輯`,
+        },
+        changeName: {
+            eng: `Change name`,
+            cht: `變更名稱`,
+        },
+        insertBefore: {
+            eng: `Insert before`,
+            cht: `插入前區塊`,
+        },
+        insertChild: {
+            eng: `Insert child`,
+            cht: `插入子區塊`,
+        },
+        insertAfter: {
+            eng: `Insert after`,
+            cht: `插入後區塊`,
+        },
+        deleteTarget: {
+            eng: `Delete target`,
+            cht: `刪除區塊`,
+        },
+        newTarget: {
+            eng: `New target`,
+            cht: `新區塊`,
+        },
+        failedToChangePermissionGroups: {
+            eng: `Failed to change permission groups`,
+            cht: `連動變更權限群組失敗`,
+        },
+        failedToClearTargets: {
+            eng: `Failed to clear existing targets`,
+            cht: `清除既有區塊數據失敗`,
+        },
+        failedToSaveTargets: {
+            eng: `Failed to save targets`,
+            cht: `儲存區塊數據失敗`,
+        },
+        successfulToSaveTargets: {
+            eng: `Save targets successfully`,
+            cht: `儲存區塊數據成功`,
+        },
+
+        groupMsg1: {
+            eng: `Please create appropriate permission groups for various users according to system management requirements.`,
+            cht: `請依照系統管理需求創建適合各類使用者適合的權限群組。`,
+        },
+        groupMsg2: {
+            eng: `When using edit mode, you can drag permission groups to change their relative order.`,
+            cht: `開啟編輯時可拖曳權限群組變更其相對順序。`,
+        },
+        addGroup: {
+            eng: `Add group`,
+            cht: `新增群組`,
+        },
+        addPermissionGroup: {
+            eng: `Add permission group`,
+            cht: `新增權限群組`,
+        },
+        groupMsgNoPick: {
+            eng: `No permission group is selected.`,
+            cht: `未選擇權限群組，請點擇上方任一權限群組以顯示管理範圍。`,
+        },
+        newGroup: {
+            eng: `New group`,
+            cht: `新權限群組`,
+        },
+        failedToAddPermissionGroup: {
+            eng: `Failed to add the permission group`,
+            cht: `新增權限群組失敗`,
+        },
+        successfulToAddPermissionGroup: {
+            eng: `Add permission group successfully`,
+            cht: `新增權限群組成功`,
+        },
+        confirmToDeletePermissionGroup: {
+            eng: `Do you want to delete the permission group[{name}]?`,
+            cht: `確認是否刪除權限群組`,
+        },
+        failedToDeletePermissionGroup: {
+            eng: `Failed to delete the permission group`,
+            cht: `刪除權限群組失敗`,
+        },
+        successfulToDeletePermissionGroup: {
+            eng: `Delete the permission group successfully`,
+            cht: `刪除權限群組成功`,
+        },
+        failedToChangeOrderPermissionGroup: {
+            eng: `Failed to change the order of permission group`,
+            cht: `變更權限群組順序失敗`,
+        },
+        successfulToChangeOrderPermissionGroup: {
+            eng: `Change the order of permission groups successfully`,
+            cht: `變更權限群組順序成功`,
+        },
+        rememberToGivePermissionGroupName: {
+            eng: `You need to give the permission group name`,
+            cht: `權限群組名稱請記得給予`,
+        },
+        isPermissionGroupNameEmpty: {
+            eng: `The {n}th permission group name is empty`,
+            cht: `第 {n} 個權限群組名稱為空`,
+        },
+        failedToSavePermissionGroup: {
+            eng: `Failed to save the permission group`,
+            cht: `儲存權限群組失敗`,
+        },
+        successfulToSavePermissionGroup: {
+            eng: `Save the permission group successfully`,
+            cht: `儲存權限群組成功`,
+        },
+
+        editUser: {
+            eng: `Edit user`,
+            cht: `編修使用者`,
+        },
+        belongToPermissionGroup: {
+            eng: `Permission group`,
+            cht: `隸屬權限群組`,
+        },
+        availableTarget: {
+            eng: `Available targets`,
+            cht: `使用者可用區塊`,
+        },
+        isAManager: {
+            eng: `Is a manager`,
+            cht: `是否為管理者`,
+        },
         isActive: {
-            eng: 'Active',
-            cht: '有效',
-        },
-        // mdInputParams: {
-        //     eng: 'Input',
-        //     cht: '輸入參數資訊或結構',
-        // },
-        // inputExample: {
-        //     eng: 'Input example',
-        //     cht: '輸入範例',
-        // },
-        // mdOutputParams: {
-        //     eng: 'Output',
-        //     cht: '回傳數據結構',
-        // },
-        // outputExample: {
-        //     eng: 'Output example',
-        //     cht: '回傳數據範例',
-        // },
-
-        // outputMenuTree: {
-        //     eng: 'Tree',
-        //     cht: '樹狀組件',
-        // },
-        // outputMenuRaw: {
-        //     eng: 'Raw',
-        //     cht: '原始數據',
-        // },
+            eng: 'Is active',
+            cht: '是否有效',
+        },
+        remark: {
+            eng: `Remark`,
+            cht: `備註`,
+        },
+        dayCreate: {
+            eng: 'Create day',
+            cht: '創建日期',
+        },
+        newUser: {
+            eng: `New user`,
+            cht: `新使用者`,
+        },
+        failedToAddUser: {
+            eng: `Failed to add the user`,
+            cht: `新增使用者失敗`,
+        },
+        successfulToAddUser: {
+            eng: `Add the user successfully`,
+            cht: `新增使用者成功`,
+        },
+        confirmToDeleteUser: {
+            eng: `Do you want to delete the user[{name}]?`,
+            cht: `確認是否刪除使用者`,
+        },
+        failedToDeleteUser: {
+            eng: `Failed to delete the user`,
+            cht: `刪除使用者失敗`,
+        },
+        successfulToDeleteUser: {
+            eng: `Delete the user successfully`,
+            cht: `刪除使用者成功`,
+        },
+        cannotShowUserDetailsInViewMode: {
+            eng: `Can not show the user details in the view mode`,
+            cht: `非編輯模式無法查閱使用者詳細資訊`,
+        },
+
+        allDefaults: {
+            eng: `All defaults`,
+            cht: `全部項目預設值`,
+        },
+        show: {
+            eng: `Show`,
+            cht: `顯示`,
+        },
+        active: {
+            eng: `Active`,
+            cht: `啟用`,
+        },
+        showChildren: {
+            eng: `Show children`,
+            cht: `所屬顯示`,
+        },
+        hideChildren: {
+            eng: `Hide children`,
+            cht: `所屬不顯示`,
+        },
+        activateChildren: {
+            eng: `Activate children`,
+            cht: `所屬啟用`,
+        },
+        deactivateChildren: {
+            eng: `Deactivate children`,
+            cht: `所屬不啟用`,
+        },
+        isUsernameEmpty: {
+            eng: `Username is empty`,
+            cht: `使用者名稱不得為空`,
+        },
+        failedToSaveUser: {
+            eng: `Failed to save the user`,
+            cht: `變更使用者失敗`,
+        },
+        successfulToSaveUser: {
+            eng: `Save the user successfully`,
+            cht: `變更使用者成功`,
+        },
 
     },
     kpText: {},