cloud-web-corejs 1.0.54-dev.729 → 1.0.54-dev.730
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
|
@@ -9,7 +9,10 @@
|
|
|
9
9
|
@submit.native.prevent
|
|
10
10
|
>
|
|
11
11
|
<el-collapse v-model="formActiveCollapseNames" class="setting-collapse">
|
|
12
|
-
<el-collapse-item
|
|
12
|
+
<el-collapse-item
|
|
13
|
+
name="1"
|
|
14
|
+
:title="i18nt('designer.setting.basicSetting')"
|
|
15
|
+
>
|
|
13
16
|
<el-form-item :label="i18nt('数据库表')">
|
|
14
17
|
<el-input type="text" v-model="formConfig.entity"></el-input>
|
|
15
18
|
</el-form-item>
|
|
@@ -41,7 +44,13 @@
|
|
|
41
44
|
</a>
|
|
42
45
|
</el-form-item>
|
|
43
46
|
<el-form-item :label="i18nt('designer.setting.formCss')">
|
|
44
|
-
<el-button
|
|
47
|
+
<el-button
|
|
48
|
+
type="info"
|
|
49
|
+
icon="el-icon-edit"
|
|
50
|
+
plain
|
|
51
|
+
round
|
|
52
|
+
@click="editFormCss"
|
|
53
|
+
>
|
|
45
54
|
{{ i18nt("designer.setting.addCss") }}
|
|
46
55
|
</el-button>
|
|
47
56
|
</el-form-item>
|
|
@@ -175,7 +184,8 @@
|
|
|
175
184
|
@click="openWfConfigDataDialog2"
|
|
176
185
|
>
|
|
177
186
|
<span>{{
|
|
178
|
-
formConfig.wfAgreeConfigData &&
|
|
187
|
+
formConfig.wfAgreeConfigData &&
|
|
188
|
+
formConfig.wfAgreeConfigData.length
|
|
179
189
|
? "已维护"
|
|
180
190
|
: ""
|
|
181
191
|
}}</span>
|
|
@@ -192,7 +202,9 @@
|
|
|
192
202
|
@click="openWfConfigDataDialog"
|
|
193
203
|
>
|
|
194
204
|
<span>{{
|
|
195
|
-
formConfig.wfConfigData && formConfig.wfConfigData.length
|
|
205
|
+
formConfig.wfConfigData && formConfig.wfConfigData.length
|
|
206
|
+
? "已维护"
|
|
207
|
+
: ""
|
|
196
208
|
}}</span>
|
|
197
209
|
<i class="el-icon-edit"></i>
|
|
198
210
|
</a>
|
|
@@ -219,7 +231,10 @@
|
|
|
219
231
|
<el-switch v-model="formConfig.multiTabEnabled"></el-switch>
|
|
220
232
|
</el-form-item>
|
|
221
233
|
<el-form-item :label="i18nt('标签名称字段')">
|
|
222
|
-
<el-input
|
|
234
|
+
<el-input
|
|
235
|
+
type="text"
|
|
236
|
+
v-model="formConfig.multiTabLabelField"
|
|
237
|
+
></el-input>
|
|
223
238
|
</el-form-item>
|
|
224
239
|
<el-form-item
|
|
225
240
|
v-if="formConfig.multiTabEnabled"
|
|
@@ -230,7 +245,7 @@
|
|
|
230
245
|
开启后新增打开独立可关闭页签，需配置「标签名称字段」
|
|
231
246
|
</span>
|
|
232
247
|
</el-form-item>
|
|
233
|
-
<el-form-item :label="i18nt('
|
|
248
|
+
<el-form-item :label="i18nt('流程启动后行为')">
|
|
234
249
|
<el-radio-group v-model="formConfig.submitBehavior">
|
|
235
250
|
<el-radio label="closeToList">关闭页签并回列表刷新</el-radio>
|
|
236
251
|
<el-radio label="refreshCurrent">刷新当前页签</el-radio>
|
|
@@ -448,7 +463,11 @@
|
|
|
448
463
|
:modal-append-to-body="true"
|
|
449
464
|
>
|
|
450
465
|
<div class="cont">
|
|
451
|
-
<code-editor
|
|
466
|
+
<code-editor
|
|
467
|
+
:mode="'css'"
|
|
468
|
+
:readonly="false"
|
|
469
|
+
v-model="formCssCode"
|
|
470
|
+
></code-editor>
|
|
452
471
|
</div>
|
|
453
472
|
<div slot="footer" class="dialog-footer">
|
|
454
473
|
<el-button
|
|
@@ -614,7 +633,11 @@
|
|
|
614
633
|
stripe=""
|
|
615
634
|
style="margin-bottom: 0px"
|
|
616
635
|
>
|
|
617
|
-
<el-table-column
|
|
636
|
+
<el-table-column
|
|
637
|
+
type="index"
|
|
638
|
+
width="35"
|
|
639
|
+
fixed="left"
|
|
640
|
+
></el-table-column>
|
|
618
641
|
<!-- <el-table-column :label="i18nt('服务')" width="150">
|
|
619
642
|
<template slot-scope="{ row }">
|
|
620
643
|
<el-select v-model="row.serveType" @change="changeServeType(row)">
|
|
@@ -669,10 +692,16 @@
|
|
|
669
692
|
</el-table-column> -->
|
|
670
693
|
<el-table-column :label="i18nt('流程模板序号')" width="150">
|
|
671
694
|
<template slot-scope="{ row }">
|
|
672
|
-
<base-input-number
|
|
695
|
+
<base-input-number
|
|
696
|
+
v-model="row.modelOrders"
|
|
697
|
+
clearable
|
|
698
|
+
></base-input-number>
|
|
673
699
|
</template>
|
|
674
700
|
</el-table-column>
|
|
675
|
-
<el-table-column
|
|
701
|
+
<el-table-column
|
|
702
|
+
:label="i18nt('节点步骤（多个值用“,”隔开）')"
|
|
703
|
+
width="250"
|
|
704
|
+
>
|
|
676
705
|
<template slot-scope="{ row }">
|
|
677
706
|
<el-input v-model="row.taskSteps" clearable></el-input>
|
|
678
707
|
</template>
|
|
@@ -716,7 +745,11 @@
|
|
|
716
745
|
</el-table>
|
|
717
746
|
</div>
|
|
718
747
|
<div class="dialog-footer" slot="footer">
|
|
719
|
-
<el-button
|
|
748
|
+
<el-button
|
|
749
|
+
@click="dialogVisible = false"
|
|
750
|
+
class="button-sty"
|
|
751
|
+
icon="el-icon-close"
|
|
752
|
+
>
|
|
720
753
|
{{ i18nt("designer.hint.cancel") }}
|
|
721
754
|
</el-button>
|
|
722
755
|
<el-button
|
|
@@ -757,7 +790,11 @@
|
|
|
757
790
|
stripe=""
|
|
758
791
|
style="margin-bottom: 0px"
|
|
759
792
|
>
|
|
760
|
-
<el-table-column
|
|
793
|
+
<el-table-column
|
|
794
|
+
type="index"
|
|
795
|
+
width="35"
|
|
796
|
+
fixed="left"
|
|
797
|
+
></el-table-column>
|
|
761
798
|
<!-- <el-table-column :label="i18nt('服务')" width="150">
|
|
762
799
|
<template slot-scope="{ row }">
|
|
763
800
|
<el-select v-model="row.serveType" @change="changeServeType(row)">
|
|
@@ -812,10 +849,16 @@
|
|
|
812
849
|
</el-table-column> -->
|
|
813
850
|
<el-table-column :label="i18nt('流程模板序号')" width="150">
|
|
814
851
|
<template slot-scope="{ row }">
|
|
815
|
-
<base-input-number
|
|
852
|
+
<base-input-number
|
|
853
|
+
v-model="row.modelOrders"
|
|
854
|
+
clearable
|
|
855
|
+
></base-input-number>
|
|
816
856
|
</template>
|
|
817
857
|
</el-table-column>
|
|
818
|
-
<el-table-column
|
|
858
|
+
<el-table-column
|
|
859
|
+
:label="i18nt('节点步骤（多个值用“,”隔开）')"
|
|
860
|
+
width="250"
|
|
861
|
+
>
|
|
819
862
|
<template slot-scope="{ row }">
|
|
820
863
|
<el-input v-model="row.taskSteps" clearable></el-input>
|
|
821
864
|
</template>
|
|
@@ -1143,7 +1186,9 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
|
|
|
1143
1186
|
});
|
|
1144
1187
|
|
|
1145
1188
|
if (syntaxErrorFlag) {
|
|
1146
|
-
this.$message.error(
|
|
1189
|
+
this.$message.error(
|
|
1190
|
+
this.i18nt("designer.setting.syntaxCheckWarning")
|
|
1191
|
+
);
|
|
1147
1192
|
return;
|
|
1148
1193
|
}
|
|
1149
1194
|
}
|
|
@@ -1170,7 +1215,9 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
|
|
|
1170
1215
|
});
|
|
1171
1216
|
|
|
1172
1217
|
if (syntaxErrorFlag) {
|
|
1173
|
-
this.$message.error(
|
|
1218
|
+
this.$message.error(
|
|
1219
|
+
this.i18nt("designer.setting.syntaxCheckWarning")
|
|
1220
|
+
);
|
|
1174
1221
|
return;
|
|
1175
1222
|
}
|
|
1176
1223
|
}
|
|
@@ -1212,7 +1259,9 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
|
|
|
1212
1259
|
});
|
|
1213
1260
|
|
|
1214
1261
|
if (syntaxErrorFlag) {
|
|
1215
|
-
this.$message.error(
|
|
1262
|
+
this.$message.error(
|
|
1263
|
+
this.i18nt("designer.setting.syntaxCheckWarning")
|
|
1264
|
+
);
|
|
1216
1265
|
return;
|
|
1217
1266
|
}
|
|
1218
1267
|
}
|
|
@@ -1235,7 +1284,9 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
|
|
|
1235
1284
|
});
|
|
1236
1285
|
|
|
1237
1286
|
if (syntaxErrorFlag) {
|
|
1238
|
-
this.$message.error(
|
|
1287
|
+
this.$message.error(
|
|
1288
|
+
this.i18nt("designer.setting.syntaxCheckWarning")
|
|
1289
|
+
);
|
|
1239
1290
|
return;
|
|
1240
1291
|
}
|
|
1241
1292
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="containt">
|
|
3
|
-
<template v-if="layoutType
|
|
3
|
+
<template v-if="layoutType === 'PC'">
|
|
4
4
|
<x-tabs
|
|
5
5
|
ref="xTabs"
|
|
6
6
|
v-model="activeName"
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
</template>
|
|
90
90
|
</x-tabs>
|
|
91
91
|
</template>
|
|
92
|
-
<template v-else-if="layoutType
|
|
92
|
+
<template v-else-if="layoutType === 'H5'">
|
|
93
93
|
<el-dialog
|
|
94
94
|
:title="$t1('明细详情')"
|
|
95
95
|
:modal-append-to-body="false"
|
|
@@ -186,7 +186,7 @@ export default {
|
|
|
186
186
|
},
|
|
187
187
|
methods: {
|
|
188
188
|
handleTabChange(tabName) {
|
|
189
|
-
if (tabName
|
|
189
|
+
if (tabName === "second") {
|
|
190
190
|
this.$refs.list.dataTableSearch();
|
|
191
191
|
} else if (tabName.startsWith("otherTab")) {
|
|
192
192
|
let refName = tabName.replace("otherTab", "list");
|
|
@@ -252,10 +252,10 @@ export default {
|
|
|
252
252
|
let dataId = row && row.id ? row.id : null;
|
|
253
253
|
let formCode = option.formCode;
|
|
254
254
|
let otherTab = this.otherTabList.find(
|
|
255
|
-
(item) => item.formCode
|
|
255
|
+
(item) => item.formCode === formCode
|
|
256
256
|
);
|
|
257
257
|
let otherTabIndex = this.otherTabList.findIndex(
|
|
258
|
-
(item) => item.formCode
|
|
258
|
+
(item) => item.formCode === formCode
|
|
259
259
|
);
|
|
260
260
|
this.activeName = `otherTab${otherTabIndex}`;
|
|
261
261
|
|
|
@@ -274,7 +274,7 @@ export default {
|
|
|
274
274
|
this.openOtherTab(row, param, option);
|
|
275
275
|
return;
|
|
276
276
|
}
|
|
277
|
-
if (this.layoutType
|
|
277
|
+
if (this.layoutType === "H5") {
|
|
278
278
|
this.openEditH5Dialog(row, param);
|
|
279
279
|
return;
|
|
280
280
|
}
|
|
@@ -531,7 +531,7 @@ export default {
|
|
|
531
531
|
|
|
532
532
|
if (!tab) {
|
|
533
533
|
let activeName = this.activeName;
|
|
534
|
-
tab = this.tabs.find((item) => item.label
|
|
534
|
+
tab = this.tabs.find((item) => item.label === activeName);
|
|
535
535
|
}
|
|
536
536
|
if (tab) {
|
|
537
537
|
tab.showContent = false;
|