cloud-web-corejs 1.0.54-dev.246 → 1.0.54-dev.248
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-render/indexMixin.js +7 -6
- package/src/views/bd/setting/bd_company_env/dialog.vue +6 -1
- package/src/views/bd/setting/bd_company_env/edit.vue +9 -1
- package/src/views/bd/setting/bd_company_env/list.vue +5 -2
- package/src/views/bd/setting/config_manage/list.vue +1 -1
- package/src/views/user/position/dialog.vue +1 -1
- package/src/views/user/project_tag/dialog.vue +9 -4
- package/src/views/user/request_setting/edit.vue +40 -35
- package/src/views/user/request_setting/list.vue +0 -1
package/package.json
CHANGED
|
@@ -1082,12 +1082,13 @@ modules = {
|
|
|
1082
1082
|
this.showFormContent = true;
|
|
1083
1083
|
this.$nextTick(() => {
|
|
1084
1084
|
this.handleShowHideRule();
|
|
1085
|
-
if (hasWf) {
|
|
1086
|
-
|
|
1087
|
-
|
|
1088
|
-
|
|
1089
|
-
|
|
1090
|
-
|
|
1085
|
+
/*if (hasWf) {
|
|
1086
|
+
|
|
1087
|
+
}*/
|
|
1088
|
+
setTimeout(() => {
|
|
1089
|
+
callback && callback()
|
|
1090
|
+
callback1 && callback1(wfParam)
|
|
1091
|
+
}, 1000)
|
|
1091
1092
|
wfParam.done()
|
|
1092
1093
|
})
|
|
1093
1094
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<el-dialog
|
|
3
|
-
:title="$t1('
|
|
3
|
+
:title="$t1('组织环境设置列表')"
|
|
4
4
|
:append-to-body="true"
|
|
5
5
|
:modal-append-to-body="true"
|
|
6
6
|
:close-on-click-modal="falseValue"
|
|
@@ -130,6 +130,11 @@ export default {
|
|
|
130
130
|
field: 'bdCompanyCode',
|
|
131
131
|
width: 150,
|
|
132
132
|
},
|
|
133
|
+
{
|
|
134
|
+
title: this.$t1('组织备注'),
|
|
135
|
+
field: 'bdCompanyRemark',
|
|
136
|
+
width: 150,
|
|
137
|
+
},
|
|
133
138
|
{
|
|
134
139
|
width: 47,
|
|
135
140
|
fixed: 'right',
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
<div class="d-header clearfix">
|
|
5
5
|
<div class="fl">
|
|
6
6
|
<i class="el-icon-info"/>
|
|
7
|
-
{{ dataId ? $t1('
|
|
7
|
+
{{ dataId ? $t1('查看组织环境设置') : $t1('新增组织环境设置') }}
|
|
8
8
|
</div>
|
|
9
9
|
<div class="fr">
|
|
10
10
|
<el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
|
|
@@ -43,6 +43,14 @@
|
|
|
43
43
|
</el-form-item>
|
|
44
44
|
</td>
|
|
45
45
|
</tr>
|
|
46
|
+
<tr>
|
|
47
|
+
<th>{{ $t1('组织备注') }}</th>
|
|
48
|
+
<td colspan="5">
|
|
49
|
+
<el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
|
|
50
|
+
v-model="bdCompanyEnv.bdCompanyRemark"
|
|
51
|
+
clearable></el-input>
|
|
52
|
+
</td>
|
|
53
|
+
</tr>
|
|
46
54
|
<tr>
|
|
47
55
|
<th>{{ $t1('创建人') }}</th>
|
|
48
56
|
<td>{{ bdCompanyEnv.createBy }}</td>
|
|
@@ -15,8 +15,6 @@
|
|
|
15
15
|
<vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
|
|
16
16
|
{{ $t1('新增') }}
|
|
17
17
|
</vxe-button>
|
|
18
|
-
<base-table-export :option="{ title: '企业组织环境设置导出', targetRef: 'table-m1'}"
|
|
19
|
-
:parent-target="_self"/>
|
|
20
18
|
</template>
|
|
21
19
|
<template #buttonRight>
|
|
22
20
|
<vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
|
|
@@ -100,6 +98,11 @@ export default {
|
|
|
100
98
|
field: 'bdCompanyCode',
|
|
101
99
|
width: 150,
|
|
102
100
|
},
|
|
101
|
+
{
|
|
102
|
+
title: this.$t1('组织备注'),
|
|
103
|
+
field: 'bdCompanyRemark',
|
|
104
|
+
width: 150,
|
|
105
|
+
},
|
|
103
106
|
{
|
|
104
107
|
field: 'createBy',
|
|
105
108
|
title: this.$t1('创建人'),
|
|
@@ -30,7 +30,7 @@ export default {
|
|
|
30
30
|
typeTabs: [
|
|
31
31
|
{label: this.$t1("导入模板"), name: "bd_attach_setting_list", inited: true},
|
|
32
32
|
{label: this.$t1("同步调用接口"), name: "request_setting_list", inited: false},
|
|
33
|
-
{label: this.$t1("
|
|
33
|
+
{label: this.$t1("组织环境设置"), name: "bd_company_env_list", inited: false},
|
|
34
34
|
]
|
|
35
35
|
}
|
|
36
36
|
},
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
|
|
63
63
|
<div class="list">
|
|
64
64
|
<div class="item" v-for="(checkRow, index) in checkRows" :key="index">
|
|
65
|
-
<p>{{
|
|
65
|
+
<p>{{ checkRow.name }}</p>
|
|
66
66
|
<a class="el-icon-close" @click="clearTable1Select(index)"></a>
|
|
67
67
|
</div>
|
|
68
68
|
</div>
|
|
@@ -144,19 +144,24 @@ export default {
|
|
|
144
144
|
field: 'tagRemark',
|
|
145
145
|
width: 250
|
|
146
146
|
},
|
|
147
|
+
{
|
|
148
|
+
field: 'createBy',
|
|
149
|
+
title: this.$t1('创建人'),
|
|
150
|
+
width: 150
|
|
151
|
+
},
|
|
147
152
|
{
|
|
148
153
|
field: 'createDate',
|
|
149
154
|
title: this.$t1('创建时间'),
|
|
150
155
|
width: 150
|
|
151
156
|
},
|
|
152
157
|
{
|
|
153
|
-
field: '
|
|
154
|
-
title: this.$t1('
|
|
158
|
+
field: 'modifyBy',
|
|
159
|
+
title: this.$t1('更新人'),
|
|
155
160
|
width: 150
|
|
156
161
|
},
|
|
157
162
|
{
|
|
158
|
-
field: '
|
|
159
|
-
title: this.$t1('
|
|
163
|
+
field: 'modifyDate',
|
|
164
|
+
title: this.$t1('更新时间'),
|
|
160
165
|
width: 150
|
|
161
166
|
},
|
|
162
167
|
{
|
|
@@ -44,22 +44,23 @@
|
|
|
44
44
|
<tr>
|
|
45
45
|
<th>
|
|
46
46
|
<em class="f-red">*</em>
|
|
47
|
-
{{ $t1('
|
|
47
|
+
{{ $t1('执行组织编码') }}
|
|
48
48
|
</th>
|
|
49
49
|
<td colspan="5">
|
|
50
|
-
<el-form-item prop="
|
|
51
|
-
<el-input type="text" autocomplete="off" v-model="requestSetting.
|
|
50
|
+
<el-form-item prop="exeCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
|
|
51
|
+
<el-input type="text" autocomplete="off" v-model="requestSetting.exeCompanyCode" clearable/>
|
|
52
52
|
</el-form-item>
|
|
53
53
|
</td>
|
|
54
|
+
<td colspan="2"><span class="tips_1">{{ $t1('注：多个用逗号","隔开') }}</span></td>
|
|
54
55
|
</tr>
|
|
55
56
|
<tr>
|
|
56
57
|
<th>
|
|
57
58
|
<em class="f-red">*</em>
|
|
58
|
-
{{ $t1('
|
|
59
|
+
{{ $t1('请求Url') }}
|
|
59
60
|
</th>
|
|
60
|
-
<td colspan="
|
|
61
|
-
<el-form-item prop="
|
|
62
|
-
<el-input type="text" autocomplete="off" v-model="requestSetting.
|
|
61
|
+
<td colspan="7">
|
|
62
|
+
<el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
|
|
63
|
+
<el-input type="text" autocomplete="off" v-model="requestSetting.url" clearable/>
|
|
63
64
|
</el-form-item>
|
|
64
65
|
</td>
|
|
65
66
|
</tr>
|
|
@@ -67,7 +68,7 @@
|
|
|
67
68
|
<th>
|
|
68
69
|
{{ $t1('请求头') }}
|
|
69
70
|
</th>
|
|
70
|
-
<td colspan="
|
|
71
|
+
<td colspan="7">
|
|
71
72
|
<el-form-item prop="header" :rules="[{ required: false, trigger: 'blur' }]">
|
|
72
73
|
<el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
|
|
73
74
|
v-model="requestSetting.header"
|
|
@@ -77,31 +78,35 @@
|
|
|
77
78
|
</tr>
|
|
78
79
|
<tr>
|
|
79
80
|
<th>
|
|
80
|
-
|
|
81
|
-
{{ $t1('是否启用') }}
|
|
81
|
+
{{ $t1('连接超时(ms)') }}
|
|
82
82
|
</th>
|
|
83
83
|
<td>
|
|
84
|
-
<el-form-item prop="
|
|
85
|
-
<
|
|
86
|
-
<el-radio :label="true">{{ $t1('启用') }}</el-radio>
|
|
87
|
-
<el-radio :label="false">{{ $t1('禁用') }}</el-radio>
|
|
88
|
-
</el-radio-group>
|
|
84
|
+
<el-form-item prop="connectTimeout" :rules="[{ required: false, trigger: 'blur' }]">
|
|
85
|
+
<base-input-number v-model="requestSetting.connectTimeout" clearable/>
|
|
89
86
|
</el-form-item>
|
|
90
87
|
</td>
|
|
88
|
+
<td colspan="2"><span class="tips_1">{{ $t1('注：不填默认10000毫秒') }}</span></td>
|
|
91
89
|
<th>
|
|
92
|
-
{{ $t1('
|
|
90
|
+
{{ $t1('读取超时(ms)') }}
|
|
93
91
|
</th>
|
|
94
92
|
<td>
|
|
95
|
-
<el-form-item prop="
|
|
96
|
-
<base-input-number v-model="requestSetting.
|
|
93
|
+
<el-form-item prop="readTimeout" :rules="[{ required: false, trigger: 'blur' }]">
|
|
94
|
+
<base-input-number v-model="requestSetting.readTimeout" clearable/>
|
|
97
95
|
</el-form-item>
|
|
98
96
|
</td>
|
|
97
|
+
<td colspan="2"><span class="tips_1">{{ $t1('注：不填默认60000毫秒') }}</span></td>
|
|
98
|
+
</tr>
|
|
99
|
+
<tr>
|
|
99
100
|
<th>
|
|
100
|
-
|
|
101
|
+
<em class="f-red">*</em>
|
|
102
|
+
{{ $t1('是否启用') }}
|
|
101
103
|
</th>
|
|
102
104
|
<td>
|
|
103
|
-
<el-form-item prop="
|
|
104
|
-
<
|
|
105
|
+
<el-form-item prop="enabled" :rules="[{ required: true, trigger: 'blur' }]">
|
|
106
|
+
<el-radio-group v-model="requestSetting.enabled">
|
|
107
|
+
<el-radio :label="true">{{ $t1('启用') }}</el-radio>
|
|
108
|
+
<el-radio :label="false">{{ $t1('禁用') }}</el-radio>
|
|
109
|
+
</el-radio-group>
|
|
105
110
|
</el-form-item>
|
|
106
111
|
</td>
|
|
107
112
|
</tr>
|
|
@@ -109,7 +114,7 @@
|
|
|
109
114
|
<th>
|
|
110
115
|
{{ $t1('备注') }}
|
|
111
116
|
</th>
|
|
112
|
-
<td colspan="
|
|
117
|
+
<td colspan="7">
|
|
113
118
|
<el-form-item prop="remark" :rules="[{ required: false, trigger: 'blur' }]">
|
|
114
119
|
<el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
|
|
115
120
|
v-model="requestSetting.remark"
|
|
@@ -117,18 +122,18 @@
|
|
|
117
122
|
</el-form-item>
|
|
118
123
|
</td>
|
|
119
124
|
</tr>
|
|
120
|
-
<!-- <tr>
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
125
|
+
<!-- <tr>
|
|
126
|
+
<th>
|
|
127
|
+
{{ $t1('前置脚本') }}
|
|
128
|
+
<scriptTestButton :script.sync="requestSetting.preScript"></scriptTestButton>
|
|
129
|
+
</th>
|
|
130
|
+
<td colspan="7">
|
|
131
|
+
<el-form-item prop="preScript" :rules="[{ required: false, trigger: 'blur' }]">
|
|
132
|
+
<code-editor mode="java" :readonly="!1" v-model="requestSetting.preScript"
|
|
133
|
+
v-if="showCodeEditor"></code-editor>
|
|
134
|
+
</el-form-item>
|
|
135
|
+
</td>
|
|
136
|
+
</tr>-->
|
|
132
137
|
<tr>
|
|
133
138
|
<th>
|
|
134
139
|
{{ $t1('后置脚本') }}
|
|
@@ -178,7 +183,7 @@ export default {
|
|
|
178
183
|
readTimeout: 60000,
|
|
179
184
|
preScript: null,
|
|
180
185
|
postScript: null,
|
|
181
|
-
exeCompanyCode:null
|
|
186
|
+
exeCompanyCode: null
|
|
182
187
|
},
|
|
183
188
|
showCodeEditor: false
|
|
184
189
|
};
|
|
@@ -14,7 +14,6 @@
|
|
|
14
14
|
<div class="fl">
|
|
15
15
|
<vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">{{ $t1('新增') }}
|
|
16
16
|
</vxe-button>
|
|
17
|
-
<base-table-export :option="{ title: '同步调用接口导出', targetRef: 'table-m1'}" :parent-target="_self"/>
|
|
18
17
|
</div>
|
|
19
18
|
<div class="fr">
|
|
20
19
|
<vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
|