w-web-perm 1.0.4 → 1.0.6

package/src/components/VeUser.vue

@@ -5,9 +5,9 @@
         _maxWidth="1200"
         _minWidth="1200"
         :fullscreen="true"
-        :title="'編修使用者'"
-        :save-btn-tooltip="'儲存'"
-        :close-btn-tooltip="'關閉'"
+        :title="$t('editUser')"
+        :save-btn-tooltip="$t('save')"
+        :close-btn-tooltip="$t('close')"
         @click-save="clickSave"
         @click-close="clickClose"
         @resize="resize"
@@ -19,7 +19,7 @@
 
                 <div style="padding:0px 20px 20px 20px; display:flex; align-items:center;">
 
-                    <div style="padding-right:10px; color:#777; white-space:nowrap;">使用者姓名:</div>
+                    <div style="padding-right:10px; color:#777; white-space:nowrap;">{{$t('username')}}:</div>
 
                     <WText
                         style="width:100%;"
@@ -30,7 +30,7 @@
 
                 <div style="padding:0px 20px 20px 20px; display:flex; align-items:center;">
 
-                    <div style="padding-right:10px; color:#777; white-space:nowrap;">電子郵件:</div>
+                    <div style="padding-right:10px; color:#777; white-space:nowrap;">{{$t('email')}}:</div>
 
                     <WText
                         style="width:100%;"
@@ -41,7 +41,7 @@
 
                 <div style="padding:0px 20px 20px 20px; display:flex; align-items:center;">
 
-                    <div style="padding-right:10px; color:#777; white-space:nowrap;">來源:</div>
+                    <div style="padding-right:10px; color:#777; white-space:nowrap;">{{$t('from')}}:</div>
 
                     <WTextSuggest
                         style="width:200px;"
@@ -56,7 +56,7 @@
 
                 <div style="padding:0px 20px 20px 20px;">
 
-                    <div style="padding-bottom:5px; color:#777; white-space:nowrap;">隸屬權限群組:</div>
+                    <div style="padding-bottom:5px; color:#777; white-space:nowrap;">{{$t('belongToPermissionGroup')}}:</div>
 
                     <div
                         style="display:inline-block; padding:0px 15px 15px 0px;"
@@ -81,7 +81,7 @@
 
                     </div>
 
-                    <div style="padding-bottom:5px; color:#777; white-space:nowrap;">使用者可用區塊:</div>
+                    <div style="padding-bottom:5px; color:#777; white-space:nowrap;">{{$t('availableTarget')}}:</div>
 
                     <div style="border:1px dashed #f26; background:rgba(255,50,100,0.05);">
 
@@ -100,7 +100,7 @@
 
                 <div style="padding:0px 20px 20px 20px; display:flex; align-items:center;">
 
-                    <div style="padding-right:10px; color:#777; white-space:nowrap;">是否為管理者:</div>
+                    <div style="padding-right:10px; color:#777; white-space:nowrap;">{{$t('isAManager')}}:</div>
 
                     <WSwitch
                         :value="u.isAdmin==='y'"
@@ -111,7 +111,7 @@
 
                 <div style="padding:0px 20px 20px 20px; display:flex; align-items:center;">
 
-                    <div style="padding-right:10px; color:#777; white-space:nowrap;">是否有效:</div>
+                    <div style="padding-right:10px; color:#777; white-space:nowrap;">{{$t('isActive')}}:</div>
 
                     <WSwitch
                         :value="u.isActive==='y'"
@@ -124,7 +124,7 @@
 
                 <div style="padding:0px 20px 20px 20px; display:flex; align-items:center;">
 
-                    <div style="padding-right:10px; color:#777; white-space:nowrap;">備註:</div>
+                    <div style="padding-right:10px; color:#777; white-space:nowrap;">{{$t('remark')}}:</div>
 
                     <WText
                         style="width:100%;"
@@ -137,7 +137,7 @@
 
                 <div style="padding:0px 20px 20px 20px; display:flex; align-items:center;">
 
-                    <div style="padding-right:10px; color:#777; white-space:nowrap;">創建日期:</div>
+                    <div style="padding-right:10px; color:#777; white-space:nowrap;">{{$t('dayCreate')}}:</div>
 
                     <div style="padding:0px 7px; border-radius:20px; font-size:0.8rem; color:#fff; background:#A1887F;">
                         {{getCreateDay(u)}}
@@ -262,7 +262,7 @@ export default {
         resize: function(msg) {
             // console.log('methods resize', msg)
 
-            let vo = this
+            // let vo = this
 
             // //panelHeight
             // vo.panelHeight = msg.contentHeightMax - 59 //- 61.6
@@ -331,7 +331,7 @@ export default {
 
                 //check
                 if (!isestr(vo.u.name)) {
-                    vo.$alert(`使用者名稱不得為空`, { type: 'error' })
+                    vo.$alert(vo.$t('isUsernameEmpty'), { type: 'error' })
                     return
                 }
 
@@ -346,7 +346,6 @@ export default {
                     description: trim(vo.u.description),
                     ruleGroupsIds: trim(vo.u.ruleGroupsIds),
                     from: trim(vo.u.from),
-                    isVirtual: 'n', //儲存時則更改為非虛擬使用者, 也就是將外部系統(如SSO或AD)使用者資料另存至資料庫中, 用以識別
                     isAdmin: vo.u.isAdmin,
                     isActive: vo.u.isActive,
                     // userId, //insert時自動由後端給予
@@ -355,27 +354,20 @@ export default {
                     // timeUpdate: timeCreate,
                 }
 
-                //mode
-                let mode = 'save'
-                if (vo.u.isVirtual === 'y') { //若是儲存虛擬使用者, 代表是第1次儲存至資料庫中, 故需要insert來自動給予userId與timeCreate
-                    mode = 'insert'
-                }
-                // console.log('vo.u.isVirtual', vo.u.isVirtual)
-
-                //insert or save
-                await vo.$fapi.users[mode](u)
+                //save
+                await vo.$fapi.users.save(u)
                     .catch((err) => {
                         errTemp = err
                     })
 
                 //check
                 if (errTemp !== null) {
-                    vo.$alert(`變更使用者失敗: ${errTemp}`, { type: 'error' })
+                    vo.$alert(`${vo.$t('failedToSaveUser')}: ${errTemp}`, { type: 'error' })
                     return
                 }
 
                 //alert
-                vo.$alert(`變更使用者成功`)
+                vo.$alert(vo.$t('successfulToSaveUser'))
 
             }
 

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