w-web-perm 1.0.12 → 1.0.13

package/server/provideUsers.mjs

@@ -12,19 +12,19 @@ async function provideUsers(url, from, users) {
 
     //ks
     let ks = [
-        'id',
-        'order',
+        // 'id',
+        'order', //order大部分由外部給予, 得要開啟
         'name',
         'email',
         'description',
         'from',
-        'ruleGroupsIds',
+        'cgrups',
         'isAdmin',
-        'userId',
-        'timeCreate',
-        'userIdUpdate',
-        'timeUpdate',
         'isActive',
+        // 'userId',
+        // 'timeCreate',
+        // 'userIdUpdate',
+        // 'timeUpdate',
     ]
 
     //ltdtpick
@@ -47,7 +47,7 @@ async function provideUsers(url, from, users) {
         .then((res) => {
             // console.log(res)
             let r = {
-                msg: '成功傳輸Users清單',
+                msg: '成功傳輸user清單',
                 res,
             }
             pm.resolve(r)
@@ -55,7 +55,7 @@ async function provideUsers(url, from, users) {
         .catch((err) => {
             // console.log(err)
             let r = {
-                msg: '無法傳輸Users清單',
+                msg: '無法傳輸user清單',
                 res: err,
             }
             pm.reject(r)

package/src/App.vue

@@ -14,7 +14,9 @@
         <CheckYesNo></CheckYesNo>
         <CheckYes></CheckYes>
 
-        <VeUser></VeUser>
+        <VeCrules></VeCrules>
+        <VeCpemis></VeCpemis>
+        <VeCgrups></VeCgrups>
 
     </div>
 </template>
@@ -30,7 +32,9 @@ import CheckYesNo from './components/Common/CheckYesNo.vue'
 import CheckYes from './components/Common/CheckYes.vue'
 import LayoutState from './components/LayoutState.vue'
 import Layout from './components/Layout.vue'
-import VeUser from './components/VeUser.vue'
+import VeCrules from './components/VeCrules.vue'
+import VeCpemis from './components/VeCpemis.vue'
+import VeCgrups from './components/VeCgrups.vue'
 
 
 export default {
@@ -40,7 +44,9 @@ export default {
         CheckYes,
         LayoutState,
         Layout,
-        VeUser,
+        VeCrules,
+        VeCpemis,
+        VeCgrups,
     },
     data: function() {
         return {
@@ -96,6 +102,13 @@ export default {
         })
         vo.ll = ll
 
+    },
+    mounted: function() {
+        let vo = this
+
+        //set, 把目前vo儲存至window供外部非vue環境使用
+        window.$vo = vo
+
     },
     computed: {
 

package/src/components/Layout.vue

@@ -51,8 +51,8 @@
 
 <script>
 import { mdiMenu } from '@mdi/js/mdi.js'
-import get from 'lodash-es/get.js'
-// import cloneDeep from 'lodash-es/cloneDeep.js'
+import get from 'lodash-es/get.js'
+// import cloneDeep from 'lodash-es/cloneDeep.js'
 import isestr from 'wsemi/src/isestr.mjs'
 import WTextSelect from 'w-component-vue/src/components/WTextSelect.vue'
 import WButtonCircle from 'w-component-vue/src/components/WButtonCircle.vue'
@@ -106,11 +106,15 @@ export default {
     computed: {
 
         viewState: function() {
-            return get(this, `$store.state.viewState`)
+            return get(this, `$store.state.viewState`, '')
         },
 
         heightToolbar: function() {
-            return get(this, `$store.state.heightToolbar`)
+            //console.log('computed heightToolbar')
+
+            let vo = this
+
+            return get(vo, `$store.state.heightToolbar`, 0)
         },
 
         webName: {
@@ -131,7 +135,11 @@ export default {
         },
 
         webLogo: function() {
-            return get(this, `$store.state.webInfor.webLogo`)
+            //console.log('computed webLogo')
+
+            let vo = this
+
+            return get(vo, `$store.state.webInfor.webLogo`, '')
         },
 
     },

package/src/components/LayoutContent.vue

@@ -28,13 +28,13 @@
                             :itemActive="menuActive"
                             :item-text-color="'#222'"
                             :item-text-color-hover="'#444'"
-                            :item-text-color-active="'#EF6C00'"
+                            :item-text-color-active="'#fff'"
                             :item-icon-color="'#222'"
                             :item-icon-color-hover="'#444'"
-                            :item-icon-color-active="'#EF6C00'"
+                            :item-icon-color-active="'#eee'"
                             :item-background-color="'#fff'"
                             :item-background-color-hover="'#f2f2f2'"
-                            :item-background-color-active="'#FFF3E0'"
+                            :item-background-color-active="'#666'"
                             :paddingStyle="{v:15,h:15}"
                             @click="(menu)=>{menuKey=menu.key}"
                         ></WListVertical>
@@ -68,14 +68,22 @@
                         <template>
 
                             <LayoutContentTargets
+                                :drawer="drawer"
                                 v-if="menuKey==='targets'"
                             ></LayoutContentTargets>
 
-                            <LayoutContentGroups
-                                v-if="menuKey==='groups'"
-                            ></LayoutContentGroups>
+                            <LayoutContentPemis
+                                :drawer="drawer"
+                                v-if="menuKey==='pemis'"
+                            ></LayoutContentPemis>
+
+                            <LayoutContentGrups
+                                :drawer="drawer"
+                                v-if="menuKey==='grups'"
+                            ></LayoutContentGrups>
 
                             <LayoutContentUsers
+                                :drawer="drawer"
                                 v-if="menuKey==='users'"
                             ></LayoutContentUsers>
 
@@ -120,24 +128,26 @@
 </template>
 
 <script>
-import { mdiGamepadCircle, mdiStackOverflow, mdiAccountGroupOutline } from '@mdi/js/mdi.js'
-import get from 'lodash-es/get.js'
-import find from 'lodash-es/find.js'
+import { mdiGamepadCircle, mdiStackOverflow, mdiSelectGroup, mdiAccountGroupOutline } from '@mdi/js/mdi.js'
+import get from 'lodash-es/get.js'
+import find from 'lodash-es/find.js'
 import WDrawer from 'w-component-vue/src/components/WDrawer.vue'
-import WButtonCircle from 'w-component-vue/src/components/WButtonCircle.vue'
 import WListVertical from 'w-component-vue/src/components/WListVertical.vue'
+import WButtonCircle from 'w-component-vue/src/components/WButtonCircle.vue'
 import LayoutContentTargets from './LayoutContentTargets.vue'
-import LayoutContentGroups from './LayoutContentGroups.vue'
+import LayoutContentPemis from './LayoutContentPemis.vue'
+import LayoutContentGrups from './LayoutContentGrups.vue'
 import LayoutContentUsers from './LayoutContentUsers.vue'
 
 
 export default {
     components: {
         WDrawer,
-        WButtonCircle,
         WListVertical,
+        WButtonCircle,
         LayoutContentTargets,
-        LayoutContentGroups,
+        LayoutContentPemis,
+        LayoutContentGrups,
         LayoutContentUsers,
     },
     props: {
@@ -172,13 +182,18 @@ export default {
                     icon: mdiGamepadCircle,
                 },
                 {
-                    key: 'groups',
-                    text: vo.$t('permissionGroups'),
+                    key: 'pemis',
+                    text: vo.$t('managementPemis'),
                     icon: mdiStackOverflow,
                 },
+                {
+                    key: 'grups',
+                    text: vo.$t('managementGrups'),
+                    icon: mdiSelectGroup,
+                },
                 {
                     key: 'users',
-                    text: vo.$t('userPermissions'),
+                    text: vo.$t('managementUsers'),
                     icon: mdiAccountGroupOutline,
                 },
             ]