cloud-web-corejs 1.0.54-dev.220 → 1.0.54-dev.222
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 +1 -1
- package/src/components/xform/form-designer/indexMixin.js +811 -1
- package/src/components/xform/form-designer/setting-panel/property-editor/wfFlag-editor.vue +4 -4
- package/src/components/xform/form-render/indexMixin.js +2392 -1
- package/src/components/xform/mixins/scriptHttp.js +14 -10
- package/src/layout/defaultLayout.vue +1 -1
- package/src/store/config/index.js +760 -1
- package/src/views/user/form/vform/out_render.vue +1 -1
- package/src/views/user/form/vform/render.vue +3 -3
- package/src/views/user/form/view/list.vue +3 -3
- package/src/views/user/request_setting/edit.vue +252 -0
- package/src/views/user/request_setting/list.vue +249 -0
|
@@ -45,11 +45,14 @@ modules = {
|
|
|
45
45
|
return this.getFormRef ? this.getFormRef() : this;
|
|
46
46
|
},
|
|
47
47
|
getLoadingTarget() {
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
let that = this.getHttpTarget();
|
|
49
|
+
if(!that ||!that.$el){
|
|
50
|
+
debugger
|
|
51
|
+
}
|
|
52
|
+
let loadingTarget = that.$el || document.body;
|
|
50
53
|
|
|
51
|
-
let loadingTarget = document.body;
|
|
52
|
-
return loadingTarget;
|
|
54
|
+
// let loadingTarget = document.body;
|
|
55
|
+
// return loadingTarget;
|
|
53
56
|
},
|
|
54
57
|
formHttp(opts) {
|
|
55
58
|
let data = opts.data;
|
|
@@ -85,7 +88,7 @@ modules = {
|
|
|
85
88
|
let getServiceName = (callback) => {
|
|
86
89
|
|
|
87
90
|
if (formCode && formCode !== reportTemplate.formCode) {
|
|
88
|
-
|
|
91
|
+
this.getHttpTarget().$http({
|
|
89
92
|
aes: true,
|
|
90
93
|
url: USER_PREFIX + `/formScript/getServiceName`,
|
|
91
94
|
method: `post`,
|
|
@@ -94,7 +97,7 @@ modules = {
|
|
|
94
97
|
scriptCode
|
|
95
98
|
},
|
|
96
99
|
isLoading,
|
|
97
|
-
loadingTarget: this.getLoadingTarget(),
|
|
100
|
+
// loadingTarget: this.getLoadingTarget(),
|
|
98
101
|
// modalStrictly: true,
|
|
99
102
|
success: res => {
|
|
100
103
|
let serviceName = res.objx;
|
|
@@ -118,11 +121,11 @@ modules = {
|
|
|
118
121
|
|
|
119
122
|
let reportGlobalMap = getReportGlobalMap() || {};
|
|
120
123
|
let url = `/${searviceName}/bd_api/${formCode}/${scriptCode}`;
|
|
121
|
-
return this.$http({
|
|
124
|
+
return this.getHttpTarget().$http({
|
|
122
125
|
aes: true,
|
|
123
126
|
url: url,
|
|
124
127
|
method: `post`,
|
|
125
|
-
loadingTarget: this.getLoadingTarget(),
|
|
128
|
+
// loadingTarget: this.getLoadingTarget(),
|
|
126
129
|
isLoading,
|
|
127
130
|
...opts,
|
|
128
131
|
data: {
|
|
@@ -152,9 +155,10 @@ modules = {
|
|
|
152
155
|
serviceId: serviceId
|
|
153
156
|
});
|
|
154
157
|
//初始化流程
|
|
155
|
-
let target1 = formTarget.$attrs['parent-target'];
|
|
158
|
+
/*let target1 = formTarget.$attrs['parent-target'];
|
|
156
159
|
let target2 = target1?.$attrs['parent-target'];
|
|
157
|
-
let target = !target2 ? this : target1
|
|
160
|
+
let target = !target2 ? this : target1;*/
|
|
161
|
+
let target = formTarget;
|
|
158
162
|
initWf.call(target, opt2);
|
|
159
163
|
}
|
|
160
164
|
}
|