mooho-base-admin-plus 2.10.4 → 2.10.6

package/package.json

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

package/src/components/workflow/flow-chart.vue

@@ -883,7 +883,6 @@
           }
         } else if (outcome.pointCount == 2) {
           if (outcome.points == null || JSON.parse(outcome.points).length != 2) {
-            let d = this.getOutcomePoint(outcome);
             outcome.points = JSON.stringify([
               { x: Math.round(((activityFrom.x - activityTo.x) * 2) / 3 + activityTo.x), y: Math.round(((activityFrom.y - activityTo.y) * 2) / 3 + activityTo.y) },
               { x: Math.round((activityFrom.x - activityTo.x) / 3 + activityTo.x), y: Math.round((activityFrom.y - activityTo.y) / 3 + activityTo.y) }

package/src/libs/request/index.js

@@ -3,6 +3,7 @@ import axios from 'axios';
 import util from '../util';
 import swal from 'sweetalert2';
 import Setting from '../../setting';
+import router from '../../router';
 
 // import { Message, Notice } from 'view-design';
 
@@ -84,6 +85,11 @@ service.interceptors.request.use(
     const token = util.cookies.get('token');
     // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
     config.headers['Authorization'] = 'Bearer ' + token;
+
+    if (router && router.currentRoute && router.currentRoute.value) {
+      config.headers['Frontend-Url'] = router.currentRoute.value.path;
+    }
+
     return config;
   },
   error => {

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 = this.$router;
-
-      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;
@@ -271,9 +262,10 @@
         this.isRecallable = this.page.applicationType.isRecallable;
 
         setTimeout(() => {
-          if (!this.allow('all')) {
-            this.$refs.table.filterData['createUserID'] = this.info.id;
-          }
+          // if (!this.allow('all')) {
+          //   this.$refs.table.filterData['s_self'] = true;
+          //   this.$refs.table.filterData['createUserID'] = this.info.id;
+          // }
 
           this.$refs.table.init(this.page.tableViewCode, () => {
             if (!this.$refs.table.tableView.autoLoadDisable) {