mooho-base-admin-plus 2.10.5 → 2.10.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -883,7 +883,6 @@
|
|
|
883
883
|
}
|
|
884
884
|
} else if (outcome.pointCount == 2) {
|
|
885
885
|
if (outcome.points == null || JSON.parse(outcome.points).length != 2) {
|
|
886
|
-
let d = this.getOutcomePoint(outcome);
|
|
887
886
|
outcome.points = JSON.stringify([
|
|
888
887
|
{ x: Math.round(((activityFrom.x - activityTo.x) * 2) / 3 + activityTo.x), y: Math.round(((activityFrom.y - activityTo.y) * 2) / 3 + activityTo.y) },
|
|
889
888
|
{ x: Math.round((activityFrom.x - activityTo.x) / 3 + activityTo.x), y: Math.round((activityFrom.y - activityTo.y) / 3 + activityTo.y) }
|
|
@@ -3,6 +3,7 @@ import axios from 'axios';
|
|
|
3
3
|
import util from '../util';
|
|
4
4
|
import swal from 'sweetalert2';
|
|
5
5
|
import Setting from '../../setting';
|
|
6
|
+
import router from '../../router';
|
|
6
7
|
|
|
7
8
|
// import { Message, Notice } from 'view-design';
|
|
8
9
|
|
|
@@ -84,6 +85,11 @@ service.interceptors.request.use(
|
|
|
84
85
|
const token = util.cookies.get('token');
|
|
85
86
|
// 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
|
|
86
87
|
config.headers['Authorization'] = 'Bearer ' + token;
|
|
88
|
+
|
|
89
|
+
if (router && router.currentRoute && router.currentRoute.value) {
|
|
90
|
+
config.headers['Frontend-Url'] = router.currentRoute.value.path;
|
|
91
|
+
}
|
|
92
|
+
|
|
87
93
|
return config;
|
|
88
94
|
},
|
|
89
95
|
error => {
|
|
@@ -262,9 +262,10 @@
|
|
|
262
262
|
this.isRecallable = this.page.applicationType.isRecallable;
|
|
263
263
|
|
|
264
264
|
setTimeout(() => {
|
|
265
|
-
if (!this.allow('all')) {
|
|
266
|
-
|
|
267
|
-
|
|
265
|
+
// if (!this.allow('all')) {
|
|
266
|
+
// this.$refs.table.filterData['s_self'] = true;
|
|
267
|
+
// this.$refs.table.filterData['createUserID'] = this.info.id;
|
|
268
|
+
// }
|
|
268
269
|
|
|
269
270
|
this.$refs.table.init(this.page.tableViewCode, () => {
|
|
270
271
|
if (!this.$refs.table.tableView.autoLoadDisable) {
|