mooho-base-admin-plus 2.10.3 → 2.10.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.3",
+  "version": "2.10.5",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/mixins/page.js

@@ -1,6 +1,5 @@
 import util from '../libs/util';
 import { cloneDeep, get, set } from 'lodash';
-import router from '../router';
 import { mapState, mapActions, mapMutations } from 'vuex';
 import dateFormat from 'date-fns/format';
 import Setting from '../setting';
@@ -111,7 +110,7 @@ export default {
         return this.userPermissions[key];
       } else {
         // 页面权限点
-        let url = router.currentRoute.value.fullPath.substr(1).split('?')[0];
+        let url = this.$router.currentRoute.value.fullPath.substr(1).split('?')[0];
 
         if (this.userPermissions[url + '$' + key] == true) {
           return true;

package/src/pages/account/login.vue

@@ -26,7 +26,6 @@
 <script>
   import { mapActions } from 'vuex';
   import mixinPage from '../../mixins/page';
-  import router from '../../router';
   //import permissionApi from '../../api/permission';
 
   export default {
@@ -68,7 +67,7 @@
 
           // 重定向对象不存在则返回顶层路径
           setTimeout(() => {
-            router.replace(this.$route.query.redirect || '/home');
+            this.$router.replace(this.$route.query.redirect || '/home');
           });
         }
       },

package/src/pages/template/processPage.vue

@@ -4,7 +4,6 @@
       <PageHeader :title="$route.meta.title" :content="$route.meta.description" hidden-breadcrumb />
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
-      {{ allow('create') }}
       <view-table ref="table" v-if="page" :create-enable="allow('create')" @create="create">
         <template #top>
           <slot name="top"></slot>
@@ -186,7 +185,6 @@
   </div>
 </template>
 <script>
-  import { useRouter } from 'vue-router';
   import modelApi from '../../api/model';
   import applicationApi from '../../api/application';
   import processInstApi from '../../api/processInst';
@@ -229,13 +227,6 @@
     },
     computed: {},
     async mounted() {
-      let router = useRouter();
-
-      console.log('router.currentRoute.value.fullPath', router.currentRoute.value.fullPath);
-      console.log('this.userPermissions', this.userPermissions);
-      console.log("url + '$' + key", router.currentRoute.value.fullPath.substr(1).split('?')[0] + '$' + 'create');
-      console.log("this.userPermissions[url + '$' + key]", this.userPermissions[router.currentRoute.value.fullPath.substr(1).split('?')[0] + '$' + 'create']);
-
       if (this.$route.meta.data.id) {
         let res = await this.loadPage(this.$route.meta.data.id);
         this.page = res.customPage;
@@ -272,7 +263,7 @@
 
         setTimeout(() => {
           if (!this.allow('all')) {
-            this.$refs.table.filterData['createUserID'] = this.info.id;
+            this.filterData['createUserID'] = this.info.id;
           }
 
           this.$refs.table.init(this.page.tableViewCode, () => {