cloud-web-corejs 1.0.54-dev.257 → 1.0.54-dev.259
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/a-link-widget.vue +1 -1
- package/src/components/xform/form-designer/form-widget/field-widget/a-text-widget.vue +1 -1
- package/src/components/xform/form-designer/form-widget/field-widget/date-widget.vue +21 -2
- package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js +49 -36
- package/src/components/xform/form-designer/form-widget/field-widget/form-item-wrapper.vue +1 -1
- package/src/components/xform/form-designer/form-widget/field-widget/text-widget.vue +1 -1
- package/src/components/xform/form-designer/setting-panel/property-editor/a-link-editor.vue +3 -3
- package/src/components/xform/form-designer/setting-panel/property-editor/a-text-editor.vue +3 -3
- package/src/components/xform/form-designer/setting-panel/property-editor/colorClass-editor.vue +28 -0
- 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 +3 -2
- package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +31 -9
- package/src/components/xform/form-render/container-item/data-table-mixin.js +6 -0
- package/src/components/xform/mixins/scriptHttp.js +172 -1
- package/src/components/xform/utils/util.js +1445 -1
- 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
@@ -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>
|