mooho-base-admin-plus 2.10.5 → 2.10.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.5",
+  "version": "2.10.7",
   "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/components/workflow/task-form.vue

@@ -233,15 +233,20 @@
       // 执行结果
       async action(outcome) {
         let isOK;
-        if (this.isCustom && typeof this.$refs.customComponent.actionValidation === 'function') {
-          isOK = await this.$refs.customComponent.actionValidation(outcome);
 
-          if (!isOK) {
-            return;
+        if (outcome.ignoreValidation == true) {
+          isOK = true;
+        } else {
+          if (this.isCustom && typeof this.$refs.customComponent.actionValidation === 'function') {
+            isOK = await this.$refs.customComponent.actionValidation(outcome);
+
+            if (!isOK) {
+              return;
+            }
           }
-        }
 
-        isOK = await this.form.validate();
+          isOK = await this.form.validate();
+        }
 
         if (!isOK) {
           this.error('Front_Msg_Form_Validate_Fail');

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/pages/template/processPage.vue

@@ -262,9 +262,10 @@
         this.isRecallable = this.page.applicationType.isRecallable;
 
         setTimeout(() => {
-          if (!this.allow('all')) {
-            this.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) {