cloud-web-corejs 1.0.54-dev.257 → 1.0.54-dev.258
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/excelExport/button.vue +1 -1
- package/src/components/excelExport/index.vue +22 -0
- package/src/components/excelExport/mixins.js +43 -3
- package/src/components/xform/form-designer/form-widget/field-widget/date-widget.vue +21 -2
- package/src/components/xform/form-designer/setting-panel/property-editor/labelColor-editor.vue +20 -11
- package/src/components/xform/form-designer/setting-panel/propertyRegister.js +2 -2
- package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +27 -6
- package/src/components/xform/form-render/container-item/data-table-mixin.js +6 -0
- package/src/layout/components/TagsView/index.vue +14 -3
- package/src/views/bd/setting/request_async_setting/edit.vue +167 -155
- package/src/views/bd/setting/request_async_setting/list.vue +6 -6
- package/src/views/user/position/edit.vue +55 -54
package/package.json
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
<template>
|
2
|
-
<el-dropdown trigger="hover">
|
2
|
+
<el-dropdown trigger="hover" :disabled="showIndexViewDialog">
|
3
3
|
<el-button type="primary" class="button-sty" size="mini">
|
4
4
|
<span>{{ $t2('列表导出', 'components.excelExport.listExport') }}</span><span class="line"></span> <i
|
5
5
|
class="el-icon-arrow-down el-icon--right"></i>
|
@@ -1,5 +1,6 @@
|
|
1
1
|
<template>
|
2
2
|
<div class="inner-dialog">
|
3
|
+
<!-- <span v-if="isMinimize"><a href="javascript:void(0)" @click="handleMinimize">导出进度:{{percentageNum+"%"}}</a></span>-->
|
3
4
|
<exportFieldDialog :visiable.sync="showExportFieldDialog" v-if="showExportFieldDialog" :param="param" @close="closeExportFieldDialog"
|
4
5
|
@confirm="confirmExportFieldDialog"></exportFieldDialog>
|
5
6
|
<el-dialog
|
@@ -14,6 +15,11 @@
|
|
14
15
|
:modal-append-to-body="false"
|
15
16
|
@close="dialogClose2"
|
16
17
|
>
|
18
|
+
<!-- <el-button class="isFullIcon" @click="handleMinimize">
|
19
|
+
<el-tooltip effect="dark" content="缩小" placement="top">
|
20
|
+
<i class="el-icon-minus"></i>
|
21
|
+
</el-tooltip>
|
22
|
+
</el-button>-->
|
17
23
|
<div class="export-box">
|
18
24
|
<div class="tips">{{ $t2('导出中,请勿关闭当前窗口', 'components.excelExport.tip') }}</div>
|
19
25
|
<el-progress :text-inside="true" :stroke-width="26" :percentage="percentageNum"
|
@@ -59,4 +65,20 @@ export default {
|
|
59
65
|
::v-deep .el-dialog__wrapper {
|
60
66
|
top: 20px !important;
|
61
67
|
}
|
68
|
+
::v-deep .el-dialog__body {
|
69
|
+
padding: 0;
|
70
|
+
|
71
|
+
.isFullIcon {
|
72
|
+
position: absolute;
|
73
|
+
top: 0;
|
74
|
+
right: 69px;
|
75
|
+
border: none !important;
|
76
|
+
background: none !important;
|
77
|
+
box-shadow: none !important;
|
78
|
+
color: #464646d6;
|
79
|
+
height: 42px;
|
80
|
+
line-height: 42px;
|
81
|
+
padding: 0;
|
82
|
+
}
|
83
|
+
}
|
62
84
|
</style>
|
@@ -89,7 +89,9 @@ function getGrid(that, tableRef) {
|
|
89
89
|
excTime: 0,
|
90
90
|
showExportFieldDialog: false,
|
91
91
|
leafColumns: [],
|
92
|
-
columns: []
|
92
|
+
columns: [],
|
93
|
+
queryParam:{},
|
94
|
+
isMinimize:false
|
93
95
|
}
|
94
96
|
},
|
95
97
|
created() {
|
@@ -100,6 +102,7 @@ function getGrid(that, tableRef) {
|
|
100
102
|
},
|
101
103
|
beforeDestroy() {
|
102
104
|
this.clearExportTimer()
|
105
|
+
this.unlockMenu();
|
103
106
|
},
|
104
107
|
methods: {
|
105
108
|
exc() {
|
@@ -121,10 +124,19 @@ function getGrid(that, tableRef) {
|
|
121
124
|
return;
|
122
125
|
}
|
123
126
|
}
|
127
|
+
this.lockMenu()
|
128
|
+
|
129
|
+
this.isMinimize = false;
|
124
130
|
this.showExportFieldDialog = true;
|
125
131
|
|
126
132
|
},
|
133
|
+
handleMinimize(){
|
134
|
+
let result = !this.showImportDialog2;
|
135
|
+
this.isMinimize = !result;
|
136
|
+
this.showImportDialog2 = result
|
137
|
+
},
|
127
138
|
dialogClose2() {
|
139
|
+
if(this.isMinimize)return;
|
128
140
|
let loadingObj = window.$vueRoot.$baseLoading({
|
129
141
|
target: document.body,
|
130
142
|
background: 'unset'
|
@@ -149,6 +161,10 @@ function getGrid(that, tableRef) {
|
|
149
161
|
this.createCountTimer();
|
150
162
|
this.tableTarget = getGrid(this.option.vue, this.option.targetRef);
|
151
163
|
|
164
|
+
//获取查询条件
|
165
|
+
let originOption = this.tableTarget.originOption;
|
166
|
+
this.queryParam = this.$baseLodash.cloneDeep(originOption.param() || {});
|
167
|
+
|
152
168
|
let that = this;
|
153
169
|
let options = this.option;
|
154
170
|
let title = options.title || this.$t2('导出', 'components.excelExport.title');
|
@@ -451,7 +467,8 @@ function getGrid(that, tableRef) {
|
|
451
467
|
let originOption = target.originOption;
|
452
468
|
let url = originOption.exportPath || originOption.path;
|
453
469
|
|
454
|
-
let params = originOption.param() || {};
|
470
|
+
// let params = originOption.param() || {};
|
471
|
+
let params = that.queryParam;
|
455
472
|
let aParam = {
|
456
473
|
current: pageNumber,
|
457
474
|
size: pPageSize,
|
@@ -901,7 +918,30 @@ function getGrid(that, tableRef) {
|
|
901
918
|
this.startProcess();
|
902
919
|
}
|
903
920
|
});
|
904
|
-
}
|
921
|
+
},
|
922
|
+
lockMenu(){
|
923
|
+
let path = this.$route.path;
|
924
|
+
let visitedViews = this.$store.state.tagsView.visitedViews
|
925
|
+
if(visitedViews){
|
926
|
+
let currentItem = visitedViews.find(item=>item.path == path)
|
927
|
+
if(currentItem && !currentItem.meta.affix){
|
928
|
+
this.$set(currentItem.meta, "affix",true)
|
929
|
+
this.$set(currentItem.meta, "user_affix",true)
|
930
|
+
}
|
931
|
+
}
|
932
|
+
|
933
|
+
},
|
934
|
+
unlockMenu(){
|
935
|
+
let path = this.$route.path;
|
936
|
+
let visitedViews = this.$store.state.tagsView.visitedViews
|
937
|
+
if(visitedViews){
|
938
|
+
let currentItem = visitedViews.find(item=>item.path == path)
|
939
|
+
if(currentItem && currentItem.meta.user_affix){
|
940
|
+
currentItem.meta.affix = false
|
941
|
+
currentItem.meta.user_affix = false
|
942
|
+
}
|
943
|
+
}
|
944
|
+
},
|
905
945
|
}
|
906
946
|
};
|
907
947
|
})();
|
@@ -10,7 +10,9 @@
|
|
10
10
|
:format="field.options.format" :value-format="field.options.valueFormat"
|
11
11
|
:placeholder="getI18nLabel(field.options.placeholder || '选择日期')"
|
12
12
|
@focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
|
13
|
-
@change="handleChangeEvent"
|
13
|
+
@change="handleChangeEvent"
|
14
|
+
:picker-options="pickerOptions"
|
15
|
+
>
|
14
16
|
</el-date-picker>
|
15
17
|
</form-item-wrapper>
|
16
18
|
</template>
|
@@ -60,6 +62,7 @@ export default {
|
|
60
62
|
oldFieldValue: null, //field组件change之前的值
|
61
63
|
fieldModel: null,
|
62
64
|
rules: [],
|
65
|
+
pickerOptions: {}
|
63
66
|
}
|
64
67
|
},
|
65
68
|
computed: {},
|
@@ -76,6 +79,15 @@ export default {
|
|
76
79
|
this.buildFieldRules()
|
77
80
|
|
78
81
|
this.handleOnCreated()
|
82
|
+
|
83
|
+
if(['year','month','date'].includes(this.field.options.type)){
|
84
|
+
this.pickerOptions.shortcuts = [{
|
85
|
+
text: this.$t1('此刻'),
|
86
|
+
onClick(picker) {
|
87
|
+
picker.$emit('pick', new Date());
|
88
|
+
}
|
89
|
+
}]
|
90
|
+
}
|
79
91
|
},
|
80
92
|
|
81
93
|
mounted() {
|
@@ -86,7 +98,14 @@ export default {
|
|
86
98
|
this.unregisterFromRefList()
|
87
99
|
},
|
88
100
|
|
89
|
-
methods: {
|
101
|
+
methods: {
|
102
|
+
setNow() {
|
103
|
+
this.$refs.fieldEditor.panel.changeToNow()
|
104
|
+
/*this.selectedDate = new Date();
|
105
|
+
// 可选:点击后自动关闭弹窗
|
106
|
+
this.$refs.datePicker.pickerVisible = false;*/
|
107
|
+
}
|
108
|
+
}
|
90
109
|
}
|
91
110
|
</script>
|
92
111
|
|
package/src/components/xform/form-designer/setting-panel/property-editor/labelColor-editor.vue
CHANGED
@@ -1,21 +1,30 @@
|
|
1
1
|
<template>
|
2
2
|
<el-form-item :label="i18nt('designer.setting.labelColor')">
|
3
|
-
<
|
3
|
+
<div>
|
4
|
+
<el-select style="width: 130px;float: left;margin-right: 5px;" v-model="optionModel.labelColor" clearable>
|
5
|
+
<el-option value="#e6a23c" label="橙"></el-option>
|
6
|
+
<el-option value="#2a6494" label="蓝"></el-option>
|
7
|
+
<el-option value="#30b08f" label="绿"></el-option>
|
8
|
+
<el-option value="#909399" label="灰"></el-option>
|
9
|
+
<el-option value="#ea5353" label="红"></el-option>
|
10
|
+
</el-select>
|
11
|
+
<el-color-picker v-model="optionModel.labelColor"></el-color-picker>
|
12
|
+
</div>
|
4
13
|
</el-form-item>
|
5
14
|
</template>
|
6
15
|
|
7
16
|
<script>
|
8
|
-
|
17
|
+
import i18n from "../../../../../components/xform/utils/i18n"
|
9
18
|
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
+
export default {
|
20
|
+
name: "labelColor-editor",
|
21
|
+
mixins: [i18n],
|
22
|
+
props: {
|
23
|
+
designer: Object,
|
24
|
+
selectedWidget: Object,
|
25
|
+
optionModel: Object,
|
26
|
+
},
|
27
|
+
}
|
19
28
|
</script>
|
20
29
|
|
21
30
|
<style scoped>
|
@@ -29,7 +29,7 @@ const COMMON_PROPERTIES = {
|
|
29
29
|
'labelHidden': 'labelHidden-editor',
|
30
30
|
'rows': 'rows-editor',
|
31
31
|
'required': 'required-editor',
|
32
|
-
'requiredHint': 'requiredHint-editor',
|
32
|
+
// 'requiredHint': 'requiredHint-editor',
|
33
33
|
'validation': 'validation-editor',
|
34
34
|
'validationHint': 'validationHint-editor',
|
35
35
|
'readonly': 'readonly-editor',
|
@@ -168,7 +168,7 @@ const ADVANCED_PROPERTIES = {
|
|
168
168
|
'controlsPosition': 'controlsPosition-editor',
|
169
169
|
'minLength': 'minLength-editor',
|
170
170
|
'maxLength': 'maxLength-editor',
|
171
|
-
'showWordLimit': 'showWordLimit-editor',
|
171
|
+
// 'showWordLimit': 'showWordLimit-editor',
|
172
172
|
'prefixIcon': 'prefixIcon-editor',
|
173
173
|
'suffixIcon': 'suffixIcon-editor',
|
174
174
|
'switchWidth': 'switchWidth-editor',
|
@@ -441,7 +441,7 @@ export const containers = [
|
|
441
441
|
customClass: "",
|
442
442
|
tableRef: "",
|
443
443
|
detailPaneContainer: true,
|
444
|
-
defaultCollapse:false,
|
444
|
+
defaultCollapse: false,
|
445
445
|
/*onCreated: "",
|
446
446
|
onMounted: "",*/
|
447
447
|
}
|
@@ -817,6 +817,7 @@ const vabsearchConfig = {
|
|
817
817
|
userDefaultVabSearch: false,
|
818
818
|
saleOrgDefaultVabSearch: false,
|
819
819
|
label: "",
|
820
|
+
labelColor: '',
|
820
821
|
submitFlag: true,
|
821
822
|
disabled: !1,
|
822
823
|
hidden: !1,
|
@@ -863,6 +864,7 @@ const projectTagConfig = {
|
|
863
864
|
keyName: "",
|
864
865
|
// keyNameSuffix: "",
|
865
866
|
label: "",
|
867
|
+
labelColor: '',
|
866
868
|
submitFlag: true,
|
867
869
|
disabled: !1,
|
868
870
|
readonly: false,
|
@@ -922,6 +924,7 @@ export const basicFields = [
|
|
922
924
|
keyNameEnabled: !1,
|
923
925
|
keyName: "",
|
924
926
|
label: "",
|
927
|
+
labelColor: '',
|
925
928
|
submitFlag: true,
|
926
929
|
/**showText: false,*/
|
927
930
|
formField: "",
|
@@ -985,6 +988,7 @@ export const basicFields = [
|
|
985
988
|
keyNameEnabled: !1,
|
986
989
|
keyName: "",
|
987
990
|
label: "",
|
991
|
+
labelColor: '',
|
988
992
|
submitFlag: true,
|
989
993
|
formField: "",
|
990
994
|
labelAlign: "",
|
@@ -1047,6 +1051,7 @@ export const basicFields = [
|
|
1047
1051
|
keyNameEnabled: !1,
|
1048
1052
|
keyName: "",
|
1049
1053
|
label: "",
|
1054
|
+
labelColor: '',
|
1050
1055
|
submitFlag: true,
|
1051
1056
|
/**showText: false,*/
|
1052
1057
|
labelAlign: "",
|
@@ -1100,6 +1105,7 @@ export const basicFields = [
|
|
1100
1105
|
keyNameEnabled: !1,
|
1101
1106
|
keyName: "",
|
1102
1107
|
label: "",
|
1108
|
+
labelColor: '',
|
1103
1109
|
submitFlag: true,
|
1104
1110
|
/**showText: false,*/
|
1105
1111
|
formField: "",
|
@@ -1156,6 +1162,7 @@ export const basicFields = [
|
|
1156
1162
|
keyNameEnabled: !1,
|
1157
1163
|
keyName: "",
|
1158
1164
|
label: "",
|
1165
|
+
labelColor: '',
|
1159
1166
|
submitFlag: true,
|
1160
1167
|
/**showText: false,*/
|
1161
1168
|
labelAlign: "",
|
@@ -1226,6 +1233,7 @@ export const basicFields = [
|
|
1226
1233
|
keyNameEnabled: !1,
|
1227
1234
|
keyName: "",
|
1228
1235
|
label: "",
|
1236
|
+
labelColor: '',
|
1229
1237
|
submitFlag: true,
|
1230
1238
|
/**showText: false,*/
|
1231
1239
|
labelAlign: "",
|
@@ -1297,6 +1305,7 @@ export const basicFields = [
|
|
1297
1305
|
keyNameEnabled: !1,
|
1298
1306
|
keyName: "",
|
1299
1307
|
label: "",
|
1308
|
+
labelColor: '',
|
1300
1309
|
submitFlag: true,
|
1301
1310
|
/**showText: false,*/
|
1302
1311
|
formField: "",
|
@@ -1379,6 +1388,7 @@ export const basicFields = [
|
|
1379
1388
|
keyNameEnabled: !1,
|
1380
1389
|
keyName: "",
|
1381
1390
|
label: "",
|
1391
|
+
labelColor: '',
|
1382
1392
|
submitFlag: true,
|
1383
1393
|
/**showText: false,*/
|
1384
1394
|
formField: "",
|
@@ -1432,6 +1442,7 @@ export const basicFields = [
|
|
1432
1442
|
keyNameEnabled: !1,
|
1433
1443
|
keyName: "",
|
1434
1444
|
label: "",
|
1445
|
+
labelColor: '',
|
1435
1446
|
submitFlag: true,
|
1436
1447
|
formField: "",
|
1437
1448
|
labelAlign: "",
|
@@ -1484,6 +1495,7 @@ export const basicFields = [
|
|
1484
1495
|
keyNameEnabled: !1,
|
1485
1496
|
keyName: "",
|
1486
1497
|
label: "",
|
1498
|
+
labelColor: '',
|
1487
1499
|
submitFlag: true,
|
1488
1500
|
/**showText: false,*/
|
1489
1501
|
formField: "",
|
@@ -1539,6 +1551,7 @@ export const basicFields = [
|
|
1539
1551
|
keyNameEnabled: !1,
|
1540
1552
|
keyName: "",
|
1541
1553
|
label: "",
|
1554
|
+
labelColor: '',
|
1542
1555
|
submitFlag: true,
|
1543
1556
|
formField: "",
|
1544
1557
|
labelAlign: "",
|
@@ -1899,6 +1912,7 @@ export const basicFields = [
|
|
1899
1912
|
keyNameEnabled: !1,
|
1900
1913
|
keyName: "",
|
1901
1914
|
label: "",
|
1915
|
+
labelColor: '',
|
1902
1916
|
submitFlag: true,
|
1903
1917
|
formField: "",
|
1904
1918
|
hidden: !1,
|
@@ -1911,7 +1925,6 @@ export const basicFields = [
|
|
1911
1925
|
onCreated: "",
|
1912
1926
|
onMounted: "",
|
1913
1927
|
accessType: "1",
|
1914
|
-
labelColor: '#555555',
|
1915
1928
|
...defaultWfConfig,
|
1916
1929
|
|
1917
1930
|
autoValueEnabled: false,
|
@@ -1936,6 +1949,7 @@ export const basicFields = [
|
|
1936
1949
|
keyNameEnabled: !1,
|
1937
1950
|
keyName: "",
|
1938
1951
|
label: "",
|
1952
|
+
labelColor: '',
|
1939
1953
|
displayStyle: "block",
|
1940
1954
|
submitFlag: true,
|
1941
1955
|
/**showText: false,*/
|
@@ -2646,6 +2660,7 @@ export const advancedFields = [
|
|
2646
2660
|
keyName: "",
|
2647
2661
|
keyNameSuffix: "",
|
2648
2662
|
label: "",
|
2663
|
+
labelColor: '',
|
2649
2664
|
submitFlag: true,
|
2650
2665
|
disabled: !1,
|
2651
2666
|
hidden: !1,
|
@@ -3034,6 +3049,7 @@ export const advancedFields = [
|
|
3034
3049
|
keyName: "",
|
3035
3050
|
keyNameSuffix: "",
|
3036
3051
|
label: "",
|
3052
|
+
labelColor: '',
|
3037
3053
|
submitFlag: true,
|
3038
3054
|
disabled: !1,
|
3039
3055
|
hidden: !1,
|
@@ -3066,6 +3082,7 @@ export const advancedFields = [
|
|
3066
3082
|
keyNameEnabled: !1,
|
3067
3083
|
keyName: "",
|
3068
3084
|
label: "",
|
3085
|
+
labelColor: '',
|
3069
3086
|
submitFlag: true,
|
3070
3087
|
disabled: !1,
|
3071
3088
|
hidden: !1,
|
@@ -3245,7 +3262,7 @@ export const businessFields = [
|
|
3245
3262
|
onCreated: "",
|
3246
3263
|
onMounted: "",
|
3247
3264
|
accessType: "1",
|
3248
|
-
labelColor: '
|
3265
|
+
labelColor: '',
|
3249
3266
|
...defaultWfConfig,
|
3250
3267
|
|
3251
3268
|
autoValueEnabled: false,
|
@@ -3283,7 +3300,7 @@ export const businessFields = [
|
|
3283
3300
|
onCreated: "",
|
3284
3301
|
onMounted: "",
|
3285
3302
|
accessType: "1",
|
3286
|
-
labelColor: '
|
3303
|
+
labelColor: '',
|
3287
3304
|
...defaultWfConfig,
|
3288
3305
|
|
3289
3306
|
autoValueEnabled: false,
|
@@ -3321,7 +3338,7 @@ export const businessFields = [
|
|
3321
3338
|
onCreated: "",
|
3322
3339
|
onMounted: "",
|
3323
3340
|
accessType: "1",
|
3324
|
-
labelColor: '
|
3341
|
+
labelColor: '',
|
3325
3342
|
...defaultWfConfig,
|
3326
3343
|
|
3327
3344
|
autoValueEnabled: false,
|
@@ -3359,7 +3376,7 @@ export const businessFields = [
|
|
3359
3376
|
onCreated: "",
|
3360
3377
|
onMounted: "",
|
3361
3378
|
accessType: "1",
|
3362
|
-
labelColor: '
|
3379
|
+
labelColor: '',
|
3363
3380
|
...defaultWfConfig,
|
3364
3381
|
|
3365
3382
|
autoValueEnabled: false,
|
@@ -3386,6 +3403,7 @@ export const businessFields = [
|
|
3386
3403
|
vabSearchName: "nick_name",
|
3387
3404
|
userDefaultVabSearch: true,
|
3388
3405
|
label: "用户",
|
3406
|
+
labelColor: '',
|
3389
3407
|
searchDialogConfig: {
|
3390
3408
|
...defaultSearchDialogConfig,
|
3391
3409
|
multipleChoices: false,
|
@@ -3408,6 +3426,7 @@ export const businessFields = [
|
|
3408
3426
|
vabSearchName: "sale_org_name",
|
3409
3427
|
saleOrgDefaultVabSearch: true,
|
3410
3428
|
label: "机构",
|
3429
|
+
labelColor: '',
|
3411
3430
|
searchDialogConfig: {
|
3412
3431
|
...defaultSearchDialogConfig,
|
3413
3432
|
multipleChoices: false,
|
@@ -3429,6 +3448,7 @@ export const businessFields = [
|
|
3429
3448
|
options: {
|
3430
3449
|
...projectTagConfig,
|
3431
3450
|
label: "用户",
|
3451
|
+
labelColor: '',
|
3432
3452
|
tagFormCode: "user_dialog",
|
3433
3453
|
tagLabelField: "nick_name",
|
3434
3454
|
tagUniqueField: "id",
|
@@ -3448,6 +3468,7 @@ export const businessFields = [
|
|
3448
3468
|
options: {
|
3449
3469
|
...projectTagConfig,
|
3450
3470
|
label: "机构",
|
3471
|
+
labelColor: '',
|
3451
3472
|
tagFormCode: "sale_org_dialog",
|
3452
3473
|
tagLabelField: "name",
|
3453
3474
|
tagUniqueField: "id",
|
@@ -15,7 +15,8 @@
|
|
15
15
|
<i class="el-icon-s-home" v-if="tag.name =='home'"></i>
|
16
16
|
{{ getMenuName(tag) }}
|
17
17
|
|
18
|
-
<span v-if="
|
18
|
+
<span v-if="!!tag.meta.user_affix" class="el-icon-close is-disabled"/>
|
19
|
+
<span v-else-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"/>
|
19
20
|
</router-link>
|
20
21
|
</scroll-pane>
|
21
22
|
<div class="tags-operBox">
|
@@ -32,7 +33,7 @@
|
|
32
33
|
<i class="el-icon-more el-icon--right"></i>
|
33
34
|
</span>
|
34
35
|
<el-dropdown-menu slot="dropdown">
|
35
|
-
<el-dropdown-item @click.native="refreshSelectedTag($route)">
|
36
|
+
<el-dropdown-item @click.native="refreshSelectedTag($route)" :disabled="getIsLock()">
|
36
37
|
<i class="el-icon-refresh"/><span>{{ $t1('刷新') }}</span>
|
37
38
|
</el-dropdown-item>
|
38
39
|
<el-dropdown-item @click.native="closeAllTags(selectedTag)">
|
@@ -191,6 +192,7 @@ export default {
|
|
191
192
|
} */
|
192
193
|
},
|
193
194
|
closeSelectedTag(view) {
|
195
|
+
if(view.meta.user_affix)return
|
194
196
|
this.$store.dispatch('tagsView/delView', view).then(({visitedViews}) => {
|
195
197
|
if (this.isActive(view)) {
|
196
198
|
this.toLastView(visitedViews, view)
|
@@ -250,7 +252,13 @@ export default {
|
|
250
252
|
},
|
251
253
|
handleScroll() {
|
252
254
|
this.closeMenu()
|
253
|
-
}
|
255
|
+
},
|
256
|
+
getIsLock() {
|
257
|
+
let path = this.$route.path;
|
258
|
+
let visitedViews = this.$store.state.tagsView.visitedViews
|
259
|
+
let currentItem = visitedViews.find(item => item.path == path)
|
260
|
+
return !!currentItem?.meta?.user_affix;
|
261
|
+
},
|
254
262
|
}
|
255
263
|
}
|
256
264
|
</script>
|
@@ -264,6 +272,9 @@ export default {
|
|
264
272
|
</style>
|
265
273
|
<style lang="scss">
|
266
274
|
//reset element css of el-icon-close
|
275
|
+
span.el-icon-close.is-disabled{
|
276
|
+
cursor: not-allowed;
|
277
|
+
}
|
267
278
|
.tags-view-wrapper {
|
268
279
|
.tags-view-item {
|
269
280
|
.el-icon-close {
|
@@ -14,161 +14,173 @@
|
|
14
14
|
</el-button>
|
15
15
|
</div>
|
16
16
|
</div>
|
17
|
-
<
|
18
|
-
<
|
19
|
-
<
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
<
|
58
|
-
<
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
</
|
92
|
-
<
|
93
|
-
<
|
94
|
-
|
95
|
-
</
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
</
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
</
|
111
|
-
|
112
|
-
|
113
|
-
<
|
114
|
-
|
115
|
-
</
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
<
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
17
|
+
<baseTabs>
|
18
|
+
<baseTabPane :label="$t1('基本信息')">
|
19
|
+
<template #default>
|
20
|
+
<table class="table-detail">
|
21
|
+
<tbody>
|
22
|
+
<tr>
|
23
|
+
<th>
|
24
|
+
<em class="f-red">*</em>
|
25
|
+
{{ $t1('推送编码') }}
|
26
|
+
</th>
|
27
|
+
<td colspan="5">
|
28
|
+
<el-form-item prop="reqCode" :rules="[{ required: true, trigger: 'blur' }]">
|
29
|
+
<el-input type="text" autocomplete="off" v-model="requestAsyncSetting.reqCode" clearable/>
|
30
|
+
</el-form-item>
|
31
|
+
</td>
|
32
|
+
</tr>
|
33
|
+
<tr>
|
34
|
+
<th>
|
35
|
+
<em class="f-red">*</em>
|
36
|
+
{{ $t1('推送名称') }}
|
37
|
+
</th>
|
38
|
+
<td colspan="5">
|
39
|
+
<el-form-item prop="reqName" :rules="[{ required: true, trigger: 'blur' }]">
|
40
|
+
<el-input type="text" autocomplete="off" v-model="requestAsyncSetting.reqName" clearable/>
|
41
|
+
</el-form-item>
|
42
|
+
</td>
|
43
|
+
</tr>
|
44
|
+
<tr>
|
45
|
+
<th>
|
46
|
+
<em class="f-red">*</em>
|
47
|
+
{{ $t1('执行组织编码') }}
|
48
|
+
</th>
|
49
|
+
<td colspan="5">
|
50
|
+
<el-form-item prop="exeCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
|
51
|
+
<el-input type="text" autocomplete="off" v-model="requestAsyncSetting.exeCompanyCode" clearable/>
|
52
|
+
</el-form-item>
|
53
|
+
</td>
|
54
|
+
<td colspan="2"><span class="tips_1">{{ $t1('注:多个用逗号","隔开') }}</span></td>
|
55
|
+
</tr>
|
56
|
+
|
57
|
+
<!-- <tr>
|
58
|
+
<th>
|
59
|
+
{{ $t1('连接超时(ms)') }}
|
60
|
+
</th>
|
61
|
+
<td>
|
62
|
+
<el-form-item prop="connectTimeout" :rules="[{ required: false, trigger: 'blur' }]">
|
63
|
+
<base-input-number v-model="requestAsyncSetting.connectTimeout" clearable/>
|
64
|
+
</el-form-item>
|
65
|
+
</td>
|
66
|
+
<td colspan="2"><span class="tips_1">{{ $t1('注:不填默认10000毫秒') }}</span></td>
|
67
|
+
<th>
|
68
|
+
{{ $t1('读取超时(ms)') }}
|
69
|
+
</th>
|
70
|
+
<td>
|
71
|
+
<el-form-item prop="readTimeout" :rules="[{ required: false, trigger: 'blur' }]">
|
72
|
+
<base-input-number v-model="requestAsyncSetting.readTimeout" clearable/>
|
73
|
+
</el-form-item>
|
74
|
+
</td>
|
75
|
+
<td colspan="2"><span class="tips_1">{{ $t1('注:不填默认60000毫秒') }}</span></td>
|
76
|
+
</tr>-->
|
77
|
+
<tr>
|
78
|
+
<th>
|
79
|
+
<em class="f-red">*</em>
|
80
|
+
{{ $t1('是否启用') }}
|
81
|
+
</th>
|
82
|
+
<td>
|
83
|
+
<el-form-item prop="enabled" :rules="[{ required: true, trigger: 'blur' }]">
|
84
|
+
<el-radio-group v-model="requestAsyncSetting.enabled">
|
85
|
+
<el-radio :label="true">{{ $t1('启用') }}</el-radio>
|
86
|
+
<el-radio :label="false">{{ $t1('禁用') }}</el-radio>
|
87
|
+
</el-radio-group>
|
88
|
+
</el-form-item>
|
89
|
+
</td>
|
90
|
+
|
91
|
+
</tr>
|
92
|
+
<tr>
|
93
|
+
<th>
|
94
|
+
{{ $t1('备注') }}
|
95
|
+
</th>
|
96
|
+
<td colspan="7">
|
97
|
+
<el-form-item prop="remark" :rules="[{ required: false, trigger: 'blur' }]">
|
98
|
+
<el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
|
99
|
+
v-model="requestAsyncSetting.remark"
|
100
|
+
clearable></el-input>
|
101
|
+
</el-form-item>
|
102
|
+
</td>
|
103
|
+
</tr>
|
104
|
+
|
105
|
+
<tr>
|
106
|
+
<th>{{ $t1('创建人') }}</th>
|
107
|
+
<td>{{ requestAsyncSetting.createBy }}</td>
|
108
|
+
<th>{{ $t1('创建时间') }}</th>
|
109
|
+
<td>{{ requestAsyncSetting.createDate }}</td>
|
110
|
+
<th>{{ $t1('更新人') }}</th>
|
111
|
+
<td>{{ requestAsyncSetting.modifyBy }}</td>
|
112
|
+
<th>{{ $t1('更新时间') }}</th>
|
113
|
+
<td>{{ requestAsyncSetting.modifyDate }}</td>
|
114
|
+
</tr>
|
115
|
+
</tbody>
|
116
|
+
</table>
|
117
|
+
</template>
|
118
|
+
</baseTabPane>
|
119
|
+
<baseTabPane :label="$t1('数据组合脚本')">
|
120
|
+
<template #default>
|
121
|
+
<table class="table-detail">
|
122
|
+
<tbody>
|
123
|
+
<tr>
|
124
|
+
<tr>
|
125
|
+
<th>
|
126
|
+
{{ $t1('脚本') }}
|
127
|
+
<scriptTestButton :script.sync="requestAsyncSetting.script"></scriptTestButton>
|
128
|
+
</th>
|
129
|
+
<td colspan="7">
|
130
|
+
<el-form-item prop="postScript" :rules="[{ required: false, trigger: 'blur' }]">
|
131
|
+
<code-editor mode="java" :readonly="!1" v-model="requestAsyncSetting.script"
|
132
|
+
v-if="showCodeEditor"></code-editor>
|
133
|
+
</el-form-item>
|
134
|
+
</td>
|
135
|
+
</tr>
|
136
|
+
</tr>
|
137
|
+
</tbody>
|
138
|
+
</table>
|
139
|
+
</template>
|
140
|
+
</baseTabPane>
|
141
|
+
<baseTabPane :label="$t1('推送数据服务信息')">
|
142
|
+
<template #default>
|
143
|
+
<table class="table-detail">
|
144
|
+
<tbody>
|
145
|
+
<tr>
|
146
|
+
<th>
|
147
|
+
<em class="f-red">*</em>
|
148
|
+
{{ $t1('请求Url') }}
|
149
|
+
</th>
|
150
|
+
<td colspan="7">
|
151
|
+
<el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
|
152
|
+
<el-input type="text" autocomplete="off" v-model="requestAsyncSetting.url" clearable/>
|
153
|
+
</el-form-item>
|
154
|
+
</td>
|
155
|
+
</tr>
|
156
|
+
<tr>
|
157
|
+
<th>
|
158
|
+
{{ $t1('请求头') }}
|
159
|
+
</th>
|
160
|
+
<td colspan="7">
|
161
|
+
<el-form-item prop="header" :rules="[{ required: false, trigger: 'blur' }]">
|
162
|
+
<el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
|
163
|
+
v-model="requestAsyncSetting.header"
|
164
|
+
clearable></el-input>
|
165
|
+
</el-form-item>
|
166
|
+
</td>
|
167
|
+
</tr>
|
168
|
+
<tr>
|
169
|
+
<th>
|
170
|
+
<em class="f-red">*</em>
|
171
|
+
{{ $t1('调度任务编码') }}
|
172
|
+
</th>
|
173
|
+
<td colspan="7">
|
174
|
+
<el-form-item prop="taskCode" :rules="[{ required: true, trigger: 'blur' }]">
|
175
|
+
<el-input type="text" autocomplete="off" v-model="requestAsyncSetting.taskCode" clearable/>
|
176
|
+
</el-form-item>
|
177
|
+
</td>
|
178
|
+
</tr>
|
179
|
+
</tbody>
|
180
|
+
</table>
|
181
|
+
</template>
|
182
|
+
</baseTabPane>
|
183
|
+
</baseTabs>
|
172
184
|
</el-form>
|
173
185
|
</div>
|
174
186
|
</template>
|
@@ -27,12 +27,12 @@
|
|
27
27
|
</div>
|
28
28
|
<vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
|
29
29
|
@submit="searchEvent" @reset="searchEvent">
|
30
|
-
<vxe-form-item title="
|
30
|
+
<vxe-form-item title="推送编码:" field="reqCode">
|
31
31
|
<template v-slot>
|
32
32
|
<el-input v-model="formData.reqCode" size="small" clearable/>
|
33
33
|
</template>
|
34
34
|
</vxe-form-item>
|
35
|
-
<vxe-form-item title="
|
35
|
+
<vxe-form-item title="推送名称:" field="reqName">
|
36
36
|
<template v-slot>
|
37
37
|
<el-input v-model="formData.reqName" size="small" clearable/>
|
38
38
|
</template>
|
@@ -107,13 +107,13 @@ export default {
|
|
107
107
|
columns: [
|
108
108
|
{type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
|
109
109
|
{
|
110
|
-
title: '
|
110
|
+
title: '推送名称',
|
111
111
|
field: 'reqName',
|
112
112
|
width: 150,
|
113
113
|
fixed: 'left'
|
114
114
|
},
|
115
115
|
{
|
116
|
-
title: '
|
116
|
+
title: '推送编码',
|
117
117
|
field: 'reqCode',
|
118
118
|
width: 150,
|
119
119
|
fixed: 'left'
|
@@ -128,7 +128,7 @@ export default {
|
|
128
128
|
field: 'header',
|
129
129
|
width: 150
|
130
130
|
},
|
131
|
-
{
|
131
|
+
/*{
|
132
132
|
title: '连接超时',
|
133
133
|
field: 'connectTimeout',
|
134
134
|
width: 150
|
@@ -137,7 +137,7 @@ export default {
|
|
137
137
|
title: '读取超时',
|
138
138
|
field: 'readTimeout',
|
139
139
|
width: 150
|
140
|
-
}
|
140
|
+
},*/
|
141
141
|
{
|
142
142
|
field: 'enabled',
|
143
143
|
title: this.$t1('是否启用'),
|
@@ -14,60 +14,61 @@
|
|
14
14
|
</el-button>
|
15
15
|
</div>
|
16
16
|
</div>
|
17
|
-
<
|
18
|
-
<
|
19
|
-
<
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
17
|
+
<baseTabs>
|
18
|
+
<baseTabPane :label="$t1('基本信息')">
|
19
|
+
<template #default>
|
20
|
+
<table class="table-detail">
|
21
|
+
<tbody>
|
22
|
+
<tr>
|
23
|
+
<th>
|
24
|
+
<em class="f-red">*</em>
|
25
|
+
{{ $t1('岗位名称') }}
|
26
|
+
</th>
|
27
|
+
<td>
|
28
|
+
<el-form-item prop="name" :rules="[{ required: true, trigger: 'blur' }]">
|
29
|
+
<el-input type="text" autocomplete="off" v-model="position.name" clearable/>
|
30
|
+
</el-form-item>
|
31
|
+
</td>
|
32
|
+
<th>
|
33
|
+
<em class="f-red">*</em>
|
34
|
+
{{ $t1('岗位编码') }}
|
35
|
+
</th>
|
36
|
+
<td>
|
37
|
+
<template v-if="dataId">
|
38
|
+
{{ position.code }}
|
39
|
+
</template>
|
40
|
+
<el-form-item v-else prop="code" :rules="[{ required: true, trigger: 'blur' }]">
|
41
|
+
<el-input type="text" autocomplete="off" v-model="position.code" clearable/>
|
42
|
+
</el-form-item>
|
43
|
+
</td>
|
44
|
+
<th>{{ $t1('设置') }}</th>
|
45
|
+
<td>
|
46
|
+
<el-checkbox :label="$t1('是否启用')" v-model="position.enabled"></el-checkbox>
|
47
|
+
</td>
|
48
|
+
</tr>
|
49
|
+
<tr>
|
50
|
+
<th>{{ $t1('备注') }}</th>
|
51
|
+
<td colspan="5">
|
52
|
+
<el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
|
53
|
+
v-model="position.memo"
|
54
|
+
clearable></el-input>
|
55
|
+
</td>
|
56
|
+
</tr>
|
57
|
+
<tr>
|
58
|
+
<th>{{ $t1('创建人') }}</th>
|
59
|
+
<td>{{ position._createBy }}</td>
|
60
|
+
<th>{{ $t1('创建时间') }}</th>
|
61
|
+
<td>{{ position.createDate }}</td>
|
62
|
+
<th>{{ $t1('更新人') }}</th>
|
63
|
+
<td>{{ position._modifyBy }}</td>
|
64
|
+
<th>{{ $t1('更新时间') }}</th>
|
65
|
+
<td>{{ position.modifyDate }}</td>
|
66
|
+
</tr>
|
67
|
+
</tbody>
|
68
|
+
</table>
|
69
|
+
</template>
|
70
|
+
</baseTabPane>
|
71
|
+
</baseTabs>
|
71
72
|
</el-form>
|
72
73
|
</div>
|
73
74
|
</template>
|