cloud-web-corejs 1.0.22 → 1.0.23
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/excelImport/index.vue +1 -1
- package/src/components/xform/form-designer/form-widget/field-widget/census-widget.vue +1 -1
- package/src/components/xform/form-designer/setting-panel/property-editor/censusClass-editor.vue +45 -0
- package/src/components/xform/form-designer/setting-panel/propertyRegister.js +1 -0
- package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +1 -0
- package/src/components/xform/lang/zh-CN.js +2 -2
- package/src/views/bd/setting/form_script/edit.vue +88 -72
- package/src/views/bd/setting/form_script/edit1.vue +141 -125
- package/src/views/bd/setting/form_template/edit.vue +136 -115
- package/src/views/bd/setting/table_model/edit.vue +16 -0
- package/src/views/user/fieldTranslation/list.vue +8 -3
- package/src/views/user/user/form_edit.vue +15 -19
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
:sub-form-col-index="subFormColIndex"
|
|
11
11
|
:sub-form-row-id="subFormRowId"
|
|
12
12
|
>
|
|
13
|
-
<div class="
|
|
13
|
+
<div :class="[field.options.censusClass]">
|
|
14
14
|
<!-- <div class="form-count-item i-s2" :style="{paddingLeft:field.options.space+'px'}">
|
|
15
15
|
<div class="t3">
|
|
16
16
|
<p>小计金额（元）</p>
|
package/src/components/xform/form-designer/setting-panel/property-editor/censusClass-editor.vue
ADDED
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<el-form-item :label="i18nt('designer.setting.styleTitClass')">
|
|
3
|
+
<el-select v-model="optionModel.censusClass">
|
|
4
|
+
<el-option v-for="(item, idx) in classList" :key="idx" :label="item.name" :value="item.value"></el-option>
|
|
5
|
+
</el-select>
|
|
6
|
+
</el-form-item>
|
|
7
|
+
</template>
|
|
8
|
+
|
|
9
|
+
<script>
|
|
10
|
+
import i18n from "../../../../../components/xform/utils/i18n";
|
|
11
|
+
import {deepClone} from "../../../../../components/xform/utils/util";
|
|
12
|
+
|
|
13
|
+
export default {
|
|
14
|
+
name: "censusClass-editor",
|
|
15
|
+
componentName: 'PropertyEditor',
|
|
16
|
+
mixins: [i18n],
|
|
17
|
+
props: {
|
|
18
|
+
designer: Object,
|
|
19
|
+
selectedWidget: Object,
|
|
20
|
+
optionModel: Object,
|
|
21
|
+
},
|
|
22
|
+
data() {
|
|
23
|
+
return {
|
|
24
|
+
classList:[{
|
|
25
|
+
name:'样式一',
|
|
26
|
+
value:'form-count'
|
|
27
|
+
},{
|
|
28
|
+
name:'样式二',
|
|
29
|
+
value:'form-count2'
|
|
30
|
+
}],
|
|
31
|
+
}
|
|
32
|
+
},
|
|
33
|
+
created() {
|
|
34
|
+
this.cssClassList = deepClone(this.designer.getCssClassList())
|
|
35
|
+
//监听表单css代码改动事件并重新加载！
|
|
36
|
+
this.designer.handleEvent('form-css-updated', (cssClassList) => {
|
|
37
|
+
this.cssClassList = cssClassList
|
|
38
|
+
})
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
</script>
|
|
42
|
+
|
|
43
|
+
<style scoped>
|
|
44
|
+
|
|
45
|
+
</style>
|
|
@@ -70,6 +70,7 @@ const COMMON_PROPERTIES = {
|
|
|
70
70
|
'descriptionsItems': 'descriptionsItems-editor',
|
|
71
71
|
'isFullscreen': 'isFullscreen-editor',
|
|
72
72
|
'tabClass': 'tabClass-editor',
|
|
73
|
+
'censusClass': 'censusClass-editor',
|
|
73
74
|
// 'scriptUuid': 'script-editor',
|
|
74
75
|
'entityTableCode': 'entityTableCode-editor',
|
|
75
76
|
|
|
@@ -17,77 +17,83 @@
|
|
|
17
17
|
</el-form>
|
|
18
18
|
</div>
|
|
19
19
|
</div>
|
|
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
|
-
|
|
20
|
+
<baseTabs>
|
|
21
|
+
<baseTabPane :label="$t1('基本信息')">
|
|
22
|
+
<template #default>
|
|
23
|
+
<table class="table-detail">
|
|
24
|
+
<tbody>
|
|
25
|
+
<tr>
|
|
26
|
+
<th>
|
|
27
|
+
<em class="f-red">*</em>
|
|
28
|
+
脚本名称
|
|
29
|
+
</th>
|
|
30
|
+
<td colspan="3">
|
|
31
|
+
<el-form-item prop="scriptName" :rules="[{ required: true, trigger: 'blur' }]">
|
|
32
|
+
<el-input type="text" autocomplete="off" v-model="formScript.scriptName" clearable/>
|
|
33
|
+
</el-form-item>
|
|
34
|
+
</td>
|
|
35
|
+
<th>脚本编码</th>
|
|
36
|
+
<td colspan="3">
|
|
37
|
+
<el-form-item prop="scriptCode" :rules="[{ required: true, trigger: 'blur' }]">
|
|
38
|
+
<el-input type="text" autocomplete="off" v-model="formScript.scriptCode" clearable/>
|
|
39
|
+
</el-form-item>
|
|
40
|
+
</td>
|
|
41
|
+
</tr>
|
|
42
|
+
<tr>
|
|
43
|
+
<th>开启事务</th>
|
|
44
|
+
<td>
|
|
45
|
+
<el-radio-group v-model="formScript.transactions">
|
|
46
|
+
<el-radio :label="1">是</el-radio>
|
|
47
|
+
<el-radio :label="0">否</el-radio>
|
|
48
|
+
</el-radio-group>
|
|
49
|
+
</td>
|
|
50
|
+
</tr>
|
|
51
|
+
<tr>
|
|
52
|
+
<th>脚本说明</th>
|
|
53
|
+
<td colspan="7">
|
|
54
|
+
<el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
|
|
55
|
+
v-model="formScript.scriptRemark"
|
|
56
|
+
clearable></el-input>
|
|
57
|
+
</td>
|
|
58
|
+
</tr>
|
|
59
|
+
<tr>
|
|
60
|
+
<th>
|
|
61
|
+
<em class="f-red">*</em>
|
|
62
|
+
脚本
|
|
63
|
+
<!-- <scriptDescriptionButton path="static/readme/ApiRequest.txt"></scriptDescriptionButton>-->
|
|
64
|
+
<scriptTestButton :script.sync="formScript.script"></scriptTestButton>
|
|
65
|
+
</th>
|
|
66
|
+
<td colspan="7">
|
|
67
|
+
<el-form-item prop="script" :rules="[{ required: true, trigger: 'blur' }]">
|
|
68
|
+
<code-editor mode="java" :readonly="readonly" v-model="formScript.script"
|
|
69
|
+
v-if="showCodeEditor"></code-editor>
|
|
70
|
+
</el-form-item>
|
|
71
|
+
</td>
|
|
72
|
+
</tr>
|
|
73
|
+
<tr>
|
|
74
|
+
<th>唯一标识</th>
|
|
75
|
+
<td colspan="7">{{ formScript.sid }}</td>
|
|
76
|
+
</tr>
|
|
77
|
+
<tr>
|
|
78
|
+
<th>{{ $t1('创建人') }}</th>
|
|
79
|
+
<td>{{ formScript.createBy }}</td>
|
|
80
|
+
<th>{{ $t1('创建时间') }}</th>
|
|
81
|
+
<td>{{ formScript.createDate }}</td>
|
|
82
|
+
<th>{{ $t1('更新人') }}</th>
|
|
83
|
+
<td>{{ formScript.modifyBy }}</td>
|
|
84
|
+
<th>{{ $t1('更新时间') }}</th>
|
|
85
|
+
<td>{{ formScript.modifyDate }}</td>
|
|
86
|
+
</tr>
|
|
87
|
+
</tbody>
|
|
88
|
+
</table>
|
|
89
|
+
</template>
|
|
90
|
+
</baseTabPane>
|
|
91
|
+
<baseTabPane label="操作日志">
|
|
92
|
+
<template #default>
|
|
93
|
+
<formOplogTable :parent-target="_self" ref="oplogTable"></formOplogTable>
|
|
94
|
+
</template>
|
|
95
|
+
</baseTabPane>
|
|
96
|
+
</baseTabs>
|
|
91
97
|
<preformDialog v-if="showPreformDialog" :visiable.sync="showPreformDialog"
|
|
92
98
|
@confirm="confirmPreformDialog"></preformDialog>
|
|
93
99
|
</el-form>
|
|
@@ -97,6 +103,7 @@
|
|
|
97
103
|
<script>
|
|
98
104
|
import {getBdFlag} from "@base/api/user";
|
|
99
105
|
import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
|
|
106
|
+
import formOplogTable from "@/components/formOplog/index.vue";
|
|
100
107
|
|
|
101
108
|
export default {
|
|
102
109
|
name: 'user_form_scriptEdit',
|
|
@@ -112,7 +119,7 @@ export default {
|
|
|
112
119
|
default: null
|
|
113
120
|
}
|
|
114
121
|
},
|
|
115
|
-
components: {preformDialog},
|
|
122
|
+
components: {formOplogTable, preformDialog},
|
|
116
123
|
data() {
|
|
117
124
|
return {
|
|
118
125
|
isEdit: false,
|
|
@@ -156,6 +163,15 @@ export default {
|
|
|
156
163
|
success: res => {
|
|
157
164
|
this.formScript = res.objx || {};
|
|
158
165
|
this.showCodeEditor = true;
|
|
166
|
+
//获取操作日志数据
|
|
167
|
+
this.$refs['oplogTable'].initData({
|
|
168
|
+
param: () => {
|
|
169
|
+
return {
|
|
170
|
+
logType: "FormScript",
|
|
171
|
+
logObjCode: this.formScript.sid
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
});
|
|
159
175
|
}
|
|
160
176
|
});
|
|
161
177
|
} else {
|
|
@@ -13,84 +13,84 @@
|
|
|
13
13
|
</el-button>
|
|
14
14
|
</div>
|
|
15
15
|
</div>
|
|
16
|
-
<
|
|
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
|
-
|
|
16
|
+
<baseTabs>
|
|
17
|
+
<baseTabPane :label="$t1('基本信息')">
|
|
18
|
+
<template #default>
|
|
19
|
+
<table class="table-detail">
|
|
20
|
+
<tbody>
|
|
21
|
+
<tr>
|
|
22
|
+
<th>
|
|
23
|
+
<em class="f-red">*</em>
|
|
24
|
+
脚本名称
|
|
25
|
+
</th>
|
|
26
|
+
<td>
|
|
27
|
+
<el-form-item prop="scriptName" :rules="[{ required: true, trigger: 'blur' }]">
|
|
28
|
+
<el-input type="text" autocomplete="off" v-model="formScript.scriptName" clearable/>
|
|
29
|
+
</el-form-item>
|
|
30
|
+
</td>
|
|
31
|
+
<th>脚本编码</th>
|
|
32
|
+
<td colspan="3">
|
|
33
|
+
<el-form-item prop="scriptCode" :rules="[{ required: true, trigger: 'blur' }]">
|
|
34
|
+
<el-input type="text" autocomplete="off" v-model="formScript.scriptCode" clearable/>
|
|
35
|
+
</el-form-item>
|
|
36
|
+
</td>
|
|
37
|
+
</tr>
|
|
38
|
+
<tr>
|
|
39
|
+
<th>
|
|
40
|
+
<em class="f-red">*</em>
|
|
41
|
+
表单分类
|
|
42
|
+
</th>
|
|
43
|
+
<td colspan="5">
|
|
44
|
+
<el-form-item v-if="formScript.formCode=='intf'" prop="menuKindName"
|
|
45
|
+
:rules="[{ required:true, trigger: ['blur', 'change'] }]">
|
|
46
|
+
<el-input
|
|
47
|
+
class="search-input"
|
|
48
|
+
max="200"
|
|
49
|
+
v-model="formScript.menuKindName"
|
|
50
|
+
@clear="
|
|
51
51
|
formScript.menuKindCode = null;
|
|
52
52
|
$forceUpdate();
|
|
53
53
|
"
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
54
|
+
v-el-readonly
|
|
55
|
+
clearable
|
|
56
|
+
>
|
|
57
|
+
<i slot="suffix" class="el-input__icon el-icon-search" @click="showMenuKindDialog = true"></i>
|
|
58
|
+
</el-input>
|
|
59
|
+
</el-form-item>
|
|
60
|
+
<span v-else>{{ formScript.menuKindName }}</span>
|
|
61
|
+
</td>
|
|
62
|
+
</tr>
|
|
63
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
|
-
|
|
64
|
+
<tr>
|
|
65
|
+
<th>表单模板编码</th>
|
|
66
|
+
<td colspan="3">
|
|
67
|
+
{{ formScript.formCode }}
|
|
68
|
+
</td>
|
|
69
|
+
<th>Url路径</th>
|
|
70
|
+
<td colspan="3">
|
|
71
|
+
/{{ formScript.formCode }}/{{ formScript.scriptCode }}
|
|
72
|
+
</td>
|
|
73
|
+
</tr>
|
|
74
|
+
<tr>
|
|
75
|
+
<th>开启事务</th>
|
|
76
|
+
<td>
|
|
77
|
+
<el-radio-group v-model="formScript.transactions">
|
|
78
|
+
<el-radio :label="1">是</el-radio>
|
|
79
|
+
<el-radio :label="0">否</el-radio>
|
|
80
|
+
</el-radio-group>
|
|
81
|
+
</td>
|
|
82
|
+
</tr>
|
|
83
|
+
<tr>
|
|
84
|
+
<th>自定义URL</th>
|
|
85
|
+
<td colspan="7">
|
|
86
|
+
<el-form-item prop="uri" :rules="[{ required: false, trigger: 'blur' }]">
|
|
87
|
+
<el-input type="text" autocomplete="off" v-model="formScript.uri" clearable/>
|
|
88
|
+
</el-form-item>
|
|
89
|
+
</td>
|
|
90
|
+
</tr>
|
|
91
|
+
<tr>
|
|
92
|
+
<th class="no"></th>
|
|
93
|
+
<td colspan="7">
|
|
94
94
|
<span class="fl tips">
|
|
95
95
|
<div>注：</div>
|
|
96
96
|
<div style="padding-left: 20px">
|
|
@@ -99,56 +99,62 @@
|
|
|
99
99
|
<p>3.第三方接口调用(DW)，'自定义URL'必须/d_api开头。</p>
|
|
100
100
|
</div>
|
|
101
101
|
</span>
|
|
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
|
-
|
|
102
|
+
</td>
|
|
103
|
+
</tr>
|
|
104
|
+
<tr>
|
|
105
|
+
<th>
|
|
106
|
+
项目标签
|
|
107
|
+
</th>
|
|
108
|
+
<td colspan="7">
|
|
109
|
+
<projectTagView v-model="formScript.formScriptTagDTOs" :readonly="true"></projectTagView>
|
|
110
|
+
</td>
|
|
111
|
+
</tr>
|
|
112
|
+
<tr>
|
|
113
|
+
<th>脚本说明</th>
|
|
114
|
+
<td colspan="7">
|
|
115
|
+
<el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
|
|
116
|
+
v-model="formScript.scriptRemark"
|
|
117
|
+
clearable></el-input>
|
|
118
|
+
</td>
|
|
119
|
+
</tr>
|
|
120
|
+
<tr>
|
|
121
|
+
<th>
|
|
122
|
+
<em class="f-red">*</em>
|
|
123
|
+
脚本
|
|
124
|
+
<!-- <scriptDescriptionButton path="static/readme/ApiRequest.txt"></scriptDescriptionButton>-->
|
|
125
|
+
<scriptTestButton :script.sync="formScript.script"></scriptTestButton>
|
|
126
|
+
</th>
|
|
127
|
+
<td colspan="7">
|
|
128
|
+
<el-form-item prop="script" :rules="[{ required: true, trigger: 'blur' }]">
|
|
129
|
+
<code-editor mode="java" :readonly="!1" v-model="formScript.script"
|
|
130
|
+
v-if="showCodeEditor"></code-editor>
|
|
131
|
+
</el-form-item>
|
|
132
|
+
</td>
|
|
133
|
+
</tr>
|
|
134
|
+
<tr>
|
|
135
|
+
<th>唯一标识</th>
|
|
136
|
+
<td colspan="7">{{ formScript.sid }}</td>
|
|
137
|
+
</tr>
|
|
138
|
+
<tr>
|
|
139
|
+
<th>{{ $t1('创建人') }}</th>
|
|
140
|
+
<td>{{ formScript.createBy }}</td>
|
|
141
|
+
<th>{{ $t1('创建时间') }}</th>
|
|
142
|
+
<td>{{ formScript.createDate }}</td>
|
|
143
|
+
<th>{{ $t1('更新人') }}</th>
|
|
144
|
+
<td>{{ formScript.modifyBy }}</td>
|
|
145
|
+
<th>{{ $t1('更新时间') }}</th>
|
|
146
|
+
<td>{{ formScript.modifyDate }}</td>
|
|
147
|
+
</tr>
|
|
148
|
+
</tbody>
|
|
149
|
+
</table>
|
|
150
|
+
</template>
|
|
151
|
+
</baseTabPane>
|
|
152
|
+
<baseTabPane label="操作日志">
|
|
153
|
+
<template #default>
|
|
154
|
+
<formOplogTable :parent-target="_self" ref="oplogTable"></formOplogTable>
|
|
155
|
+
</template>
|
|
156
|
+
</baseTabPane>
|
|
157
|
+
</baseTabs>
|
|
152
158
|
</el-form>
|
|
153
159
|
<MenuKindDialog v-if="showMenuKindDialog"
|
|
154
160
|
:visiable.sync="showMenuKindDialog"
|
|
@@ -166,6 +172,7 @@ import {getBdFlag} from "@base/api/user";
|
|
|
166
172
|
import MenuKindDialog from "../../../../views/bd/setting/menu_kind/dialog";
|
|
167
173
|
import projectTagView from "@base/components/projectTag/view.vue";
|
|
168
174
|
import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
|
|
175
|
+
import formOplogTable from "@/components/formOplog/index.vue";
|
|
169
176
|
|
|
170
177
|
export default {
|
|
171
178
|
name: 'user_form_scriptEdit',
|
|
@@ -175,7 +182,7 @@ export default {
|
|
|
175
182
|
formTemplate: Object,
|
|
176
183
|
currentFormType: Object
|
|
177
184
|
},
|
|
178
|
-
components: {preformDialog, projectTagView, MenuKindDialog},
|
|
185
|
+
components: {formOplogTable, preformDialog, projectTagView, MenuKindDialog},
|
|
179
186
|
data() {
|
|
180
187
|
return {
|
|
181
188
|
isEdit: false,
|
|
@@ -231,6 +238,15 @@ export default {
|
|
|
231
238
|
success: res => {
|
|
232
239
|
this.formScript = res.objx || {};
|
|
233
240
|
this.showCodeEditor = true;
|
|
241
|
+
//获取操作日志数据
|
|
242
|
+
this.$refs['oplogTable'].initData({
|
|
243
|
+
param: () => {
|
|
244
|
+
return {
|
|
245
|
+
logType: "FormScript",
|
|
246
|
+
logObjCode: this.formScript.sid
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
});
|
|
234
250
|
}
|
|
235
251
|
});
|
|
236
252
|
} else {
|
|
@@ -10,121 +10,124 @@
|
|
|
10
10
|
<el-button type="success" class="button-sty" @click="openDesignDialog"
|
|
11
11
|
icon="iconfont icon-liuchengguanli-shejiqi_liucheng" v-if="!!dataId">表单设计
|
|
12
12
|
</el-button>
|
|
13
|
-
<el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
|
|
13
|
+
<el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
|
|
14
|
+
{{ $t1('重置') }}
|
|
14
15
|
</el-button>
|
|
15
|
-
<el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData" v-if="isDev">
|
|
16
|
+
<el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData" v-if="isDev">
|
|
17
|
+
{{ $t1('保存') }}
|
|
16
18
|
</el-button>
|
|
17
19
|
</div>
|
|
18
20
|
</div>
|
|
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
|
-
|
|
21
|
+
<baseTabs>
|
|
22
|
+
<baseTabPane :label="$t1('基本信息')">
|
|
23
|
+
<template #default>
|
|
24
|
+
<table class="table-detail">
|
|
25
|
+
<tbody>
|
|
26
|
+
<tr>
|
|
27
|
+
<th>
|
|
28
|
+
<em class="f-red">*</em>
|
|
29
|
+
模板名称
|
|
30
|
+
</th>
|
|
31
|
+
<td colspan="3">
|
|
32
|
+
<el-form-item prop="formName" :rules="[{ required: true, trigger: 'blur' }]">
|
|
33
|
+
<el-input type="text" autocomplete="off" v-model="formTemplate.formName" clearable/>
|
|
34
|
+
</el-form-item>
|
|
35
|
+
</td>
|
|
36
|
+
</tr>
|
|
37
|
+
<tr>
|
|
38
|
+
<th>模板编码</th>
|
|
39
|
+
<td colspan="3">
|
|
40
|
+
<el-form-item prop="formCode" :rules="[{ required: true, trigger: 'blur' }]" v-if="!formTemplate.id">
|
|
41
|
+
<el-input type="text" autocomplete="off" v-model="formTemplate.formCode" clearable/>
|
|
42
|
+
</el-form-item>
|
|
43
|
+
<template v-else>
|
|
44
|
+
{{ formTemplate.formCode }}
|
|
45
|
+
</template>
|
|
46
|
+
</td>
|
|
47
|
+
</tr>
|
|
48
|
+
<tr>
|
|
49
|
+
<!-- <th>-->
|
|
50
|
+
<!-- <em class="f-red">*</em>-->
|
|
51
|
+
<!-- 服务名-->
|
|
52
|
+
<!-- </th>-->
|
|
53
|
+
<!-- <td>-->
|
|
54
|
+
<!-- <el-form-item prop="serviceId" :rules="[{ required: true, trigger: 'blur' }]">-->
|
|
55
|
+
<!-- <el-select v-model="formTemplate.serviceId">-->
|
|
56
|
+
<!-- <el-option v-for="serviceId in serviceIds" :value="serviceId">{{ serviceId }}</el-option>-->
|
|
57
|
+
<!-- </el-select>-->
|
|
58
|
+
<!-- </el-form-item>-->
|
|
59
|
+
<!-- </td>-->
|
|
60
|
+
<th>是否启用</th>
|
|
61
|
+
<td>
|
|
62
|
+
<el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
|
|
63
|
+
<el-radio-group v-model="formTemplate.enabled">
|
|
64
|
+
<el-radio :label="true">启用</el-radio>
|
|
65
|
+
<el-radio :label="false">禁用</el-radio>
|
|
66
|
+
</el-radio-group>
|
|
67
|
+
</el-form-item>
|
|
68
|
+
</td>
|
|
69
|
+
</tr>
|
|
70
|
+
<tr>
|
|
71
|
+
<th>
|
|
72
|
+
<em class="f-red">*</em>
|
|
73
|
+
表单分类
|
|
74
|
+
</th>
|
|
75
|
+
<td colspan="5">
|
|
76
|
+
<el-form-item prop="menuKindName" :rules="[{ required:true, trigger: ['blur', 'change'] }]">
|
|
77
|
+
<el-input
|
|
78
|
+
class="search-input"
|
|
79
|
+
max="200"
|
|
80
|
+
v-model="formTemplate.menuKindName"
|
|
81
|
+
@clear="
|
|
80
82
|
formTemplate.menuKindCode = '';
|
|
81
83
|
$forceUpdate();
|
|
82
84
|
"
|
|
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
|
-
|
|
85
|
+
v-el-readonly
|
|
86
|
+
clearable
|
|
87
|
+
>
|
|
88
|
+
<i slot="suffix" class="el-input__icon el-icon-search" @click="showMenuKindDialog = true"></i>
|
|
89
|
+
</el-input>
|
|
90
|
+
</el-form-item>
|
|
91
|
+
</td>
|
|
92
|
+
</tr>
|
|
93
|
+
<tr>
|
|
94
|
+
<th>{{ $t1('备注') }}</th>
|
|
95
|
+
<td colspan="5">
|
|
96
|
+
<el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
|
|
97
|
+
v-model="formTemplate.remark"
|
|
98
|
+
clearable></el-input>
|
|
99
|
+
</td>
|
|
100
|
+
</tr>
|
|
101
|
+
<tr>
|
|
102
|
+
<th>
|
|
103
|
+
<em class="f-red">*</em>
|
|
104
|
+
模板版本
|
|
105
|
+
</th>
|
|
106
|
+
<td>{{ formTemplate.formVersion }}</td>
|
|
107
|
+
<th>是否历史版本</th>
|
|
108
|
+
<td>{{ formTemplate.history ? '是' : '否' }}</td>
|
|
109
|
+
</tr>
|
|
110
|
+
<tr>
|
|
111
|
+
<th>
|
|
112
|
+
项目标签
|
|
113
|
+
</th>
|
|
114
|
+
<td colspan="7">
|
|
115
|
+
<projectTagView v-model="formTemplate.formTemplateTagDTOs" :readonly="true"></projectTagView>
|
|
116
|
+
</td>
|
|
117
|
+
</tr>
|
|
118
|
+
<tr>
|
|
119
|
+
<th>{{ $t1('创建人') }}</th>
|
|
120
|
+
<td>{{ formTemplate.createBy }}</td>
|
|
121
|
+
<th>{{ $t1('创建时间') }}</th>
|
|
122
|
+
<td>{{ formTemplate.createDate }}</td>
|
|
123
|
+
<th>{{ $t1('更新人') }}</th>
|
|
124
|
+
<td>{{ formTemplate.modifyBy }}</td>
|
|
125
|
+
<th>{{ $t1('更新时间') }}</th>
|
|
126
|
+
<td>{{ formTemplate.modifyDate }}</td>
|
|
127
|
+
</tr>
|
|
128
|
+
<tr>
|
|
129
|
+
<th><span class="tips">URL说明</span></th>
|
|
130
|
+
<td colspan="7">
|
|
128
131
|
<span class="fl tips">
|
|
129
132
|
<div> 一、表单模板嵌入第三方系统URL配置</div>
|
|
130
133
|
<div style="padding-left: 20px">
|
|
@@ -146,12 +149,18 @@
|
|
|
146
149
|
<p>7、tp与access_token只需要传其中一个即可；</p>
|
|
147
150
|
</div>
|
|
148
151
|
</span>
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
152
|
+
</td>
|
|
153
|
+
</tr>
|
|
154
|
+
</tbody>
|
|
155
|
+
</table>
|
|
156
|
+
</template>
|
|
157
|
+
</baseTabPane>
|
|
158
|
+
<baseTabPane label="操作日志">
|
|
159
|
+
<template #default>
|
|
160
|
+
<formOplogTable :parent-target="_self" ref="oplogTable"></formOplogTable>
|
|
161
|
+
</template>
|
|
162
|
+
</baseTabPane>
|
|
163
|
+
</baseTabs>
|
|
155
164
|
</el-form>
|
|
156
165
|
<MenuKindDialog v-if="showMenuKindDialog"
|
|
157
166
|
:visiable.sync="showMenuKindDialog"
|
|
@@ -169,6 +178,8 @@ import MenuKindDialog from "../../../../views/bd/setting/menu_kind/dialog";
|
|
|
169
178
|
import {getBdFlag} from "@base/api/user";
|
|
170
179
|
import projectTagView from "@base/components/projectTag/view.vue";
|
|
171
180
|
import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
|
|
181
|
+
import formOplogTable from "@base/components/formOplog/index.vue";
|
|
182
|
+
|
|
172
183
|
|
|
173
184
|
export default {
|
|
174
185
|
name: 'bd_form_templateEdit',
|
|
@@ -179,7 +190,8 @@ export default {
|
|
|
179
190
|
components: {
|
|
180
191
|
projectTagView,
|
|
181
192
|
MenuKindDialog,
|
|
182
|
-
preformDialog
|
|
193
|
+
preformDialog,
|
|
194
|
+
formOplogTable
|
|
183
195
|
},
|
|
184
196
|
data() {
|
|
185
197
|
return {
|
|
@@ -231,6 +243,15 @@ export default {
|
|
|
231
243
|
this.$nextTick(() => {
|
|
232
244
|
this.isInited = true;
|
|
233
245
|
});
|
|
246
|
+
//获取操作日志数据
|
|
247
|
+
this.$refs['oplogTable'].initData({
|
|
248
|
+
param: () => {
|
|
249
|
+
return {
|
|
250
|
+
logType: "FormTemplate",
|
|
251
|
+
logObjCode: this.formTemplate.formCode
|
|
252
|
+
};
|
|
253
|
+
}
|
|
254
|
+
});
|
|
234
255
|
}
|
|
235
256
|
});
|
|
236
257
|
} else {
|
|
@@ -220,6 +220,11 @@
|
|
|
220
220
|
</table>
|
|
221
221
|
</template>
|
|
222
222
|
</baseTabPane>
|
|
223
|
+
<baseTabPane label="操作日志">
|
|
224
|
+
<template #default>
|
|
225
|
+
<formOplogTable :parent-target="_self" ref="oplogTable"></formOplogTable>
|
|
226
|
+
</template>
|
|
227
|
+
</baseTabPane>
|
|
223
228
|
</baseTabs>
|
|
224
229
|
</el-form>
|
|
225
230
|
|
|
@@ -370,6 +375,7 @@ import zdDialog from '../../../../views/bd/setting/table_model/zdDialog.vue';
|
|
|
370
375
|
import {getBdFlag} from "../../../../api/user";
|
|
371
376
|
import projectTagView from "../../../../components/projectTag/view.vue";
|
|
372
377
|
import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
|
|
378
|
+
import formOplogTable from "@/components/formOplog/index.vue";
|
|
373
379
|
|
|
374
380
|
export default {
|
|
375
381
|
name: 'szTaMbEdit',
|
|
@@ -378,6 +384,7 @@ export default {
|
|
|
378
384
|
currentFormType: Object
|
|
379
385
|
},
|
|
380
386
|
components: {
|
|
387
|
+
formOplogTable,
|
|
381
388
|
preformDialog,
|
|
382
389
|
projectTagView,
|
|
383
390
|
szTaMbDialog,
|
|
@@ -463,6 +470,15 @@ export default {
|
|
|
463
470
|
} else {
|
|
464
471
|
callback(res)
|
|
465
472
|
}
|
|
473
|
+
//获取操作日志数据
|
|
474
|
+
this.$refs['oplogTable'].initData({
|
|
475
|
+
param: () => {
|
|
476
|
+
return {
|
|
477
|
+
logType: "SzTaMb",
|
|
478
|
+
logObjCode: this.szTaMb.taCode
|
|
479
|
+
};
|
|
480
|
+
}
|
|
481
|
+
});
|
|
466
482
|
|
|
467
483
|
}
|
|
468
484
|
});
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
</template>
|
|
51
51
|
<template #buttonRight>
|
|
52
52
|
<vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
|
|
53
|
-
plain>{{$t1('重置')}}
|
|
53
|
+
plain>{{ $t1('重置') }}
|
|
54
54
|
</vxe-button>
|
|
55
55
|
<vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
|
|
56
56
|
</vxe-button>
|
|
@@ -239,9 +239,14 @@ export default {
|
|
|
239
239
|
tableName: 'user_fieldTranslation_list-m1',
|
|
240
240
|
path: USER_PREFIX + '/fieldTranslation/listPage',
|
|
241
241
|
param: () => {
|
|
242
|
+
let tagCodes = null;
|
|
243
|
+
if (this.checkTags.length) {
|
|
244
|
+
tagCodes = this.checkTags.map(item => item.tagCode);
|
|
245
|
+
}
|
|
242
246
|
return {
|
|
243
247
|
...this.formData,
|
|
244
|
-
dataTypeCode: this.currentDataType.dataTypeCode
|
|
248
|
+
dataTypeCode: this.currentDataType.dataTypeCode,
|
|
249
|
+
tagCodes
|
|
245
250
|
};
|
|
246
251
|
},
|
|
247
252
|
config: {
|
|
@@ -304,7 +309,7 @@ export default {
|
|
|
304
309
|
this.openFieldTranslationEditDialog(row.id);
|
|
305
310
|
}}
|
|
306
311
|
>
|
|
307
|
-
<el-tooltip enterable={false} effect="dark" content={
|
|
312
|
+
<el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
|
|
308
313
|
popper-class="tooltip-skin">
|
|
309
314
|
<i class="el-icon-edit"/>
|
|
310
315
|
</el-tooltip>
|
|
@@ -4,13 +4,11 @@
|
|
|
4
4
|
<div class="d-header clearfix">
|
|
5
5
|
<div class="fl">
|
|
6
6
|
<i class="el-icon-info"/>
|
|
7
|
-
{{ dataId ? $t1('查看') : $t1('新增') }} 用户
|
|
7
|
+
{{ dataId ? $t1('查看') : $t1('新增') }} {{ $t1('用户') }}
|
|
8
8
|
</div>
|
|
9
9
|
<div class="fr">
|
|
10
|
-
<!-- <temp-storage-button :option="tempStorageOption" v-if="!dataId"></temp-storage-button>-->
|
|
11
|
-
<base-input-export :option="exportOption" :parent-target="_self" v-if="dataId"/>
|
|
12
10
|
<el-button type="primary" plain class="button-sty" icon="el-icon-unlock" @click="unlock" v-if="user.locked"
|
|
13
|
-
v-hasPermi="'user:unlock'"
|
|
11
|
+
v-hasPermi="'user:unlock'">{{ $t1('解锁') }}
|
|
14
12
|
</el-button>
|
|
15
13
|
<el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
|
|
16
14
|
{{ $t1('重置') }}
|
|
@@ -27,7 +25,7 @@
|
|
|
27
25
|
<tr>
|
|
28
26
|
<th>
|
|
29
27
|
<em class="f-red">*</em>
|
|
30
|
-
登录名
|
|
28
|
+
{{ $t1('登录名') }}
|
|
31
29
|
</th>
|
|
32
30
|
<td colspan="3">
|
|
33
31
|
<el-form-item prop="loginAccount" :rules="[{ required: true, trigger: 'blur' }]">
|
|
@@ -42,13 +40,13 @@
|
|
|
42
40
|
</el-form-item>
|
|
43
41
|
</td>
|
|
44
42
|
<td colspan="4">
|
|
45
|
-
<span class="tips"
|
|
43
|
+
<span class="tips">{{ $t1('注：登录名必须以“dev_”开头') }}</span>
|
|
46
44
|
</td>
|
|
47
45
|
</tr>
|
|
48
46
|
<tr>
|
|
49
47
|
<th>
|
|
50
48
|
<em class="f-red">*</em>
|
|
51
|
-
姓名
|
|
49
|
+
{{ $t1('姓名') }}
|
|
52
50
|
</th>
|
|
53
51
|
<td colspan="3">
|
|
54
52
|
<el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
|
|
@@ -61,7 +59,7 @@
|
|
|
61
59
|
|
|
62
60
|
<th>
|
|
63
61
|
<em class="f-red" v-if="!dataId">*</em>
|
|
64
|
-
密码
|
|
62
|
+
{{ $t1('密码') }}
|
|
65
63
|
</th>
|
|
66
64
|
<td>
|
|
67
65
|
<el-form-item prop="password" :rules="passRules">
|
|
@@ -71,7 +69,7 @@
|
|
|
71
69
|
</td>
|
|
72
70
|
<th>
|
|
73
71
|
<em class="f-red" v-if="!dataId">*</em>
|
|
74
|
-
确认密码
|
|
72
|
+
{{ $t1('确认密码') }}
|
|
75
73
|
</th>
|
|
76
74
|
<td>
|
|
77
75
|
<el-form-item prop="rePassword" :rules="pass2Rules">
|
|
@@ -90,9 +88,9 @@
|
|
|
90
88
|
</td>
|
|
91
89
|
</tr>
|
|
92
90
|
<tr>
|
|
93
|
-
<th
|
|
91
|
+
<th>{{ $t1('设置') }}</th>
|
|
94
92
|
<td>
|
|
95
|
-
<el-checkbox label="是否启用" v-model="user.enabled"></el-checkbox>
|
|
93
|
+
<el-checkbox :label="$t1('是否启用')" v-model="user.enabled"></el-checkbox>
|
|
96
94
|
</td>
|
|
97
95
|
</tr>
|
|
98
96
|
<tr>
|
|
@@ -116,8 +114,6 @@
|
|
|
116
114
|
|
|
117
115
|
<script>
|
|
118
116
|
import xeUtils from "xe-utils";
|
|
119
|
-
/*import tempStorageButton from "@base/components/tempStorage/index.vue";*/
|
|
120
|
-
|
|
121
117
|
|
|
122
118
|
export default {
|
|
123
119
|
name: 'UserEdit',
|
|
@@ -127,7 +123,7 @@ export default {
|
|
|
127
123
|
var validatePass = (rule, value, callback) => {
|
|
128
124
|
const isPassRequired = !this.dataId;
|
|
129
125
|
if (isPassRequired && (value == '' || value == undefined)) {
|
|
130
|
-
callback(new Error('密码不能为空'));
|
|
126
|
+
callback(new Error(this.$t1('密码不能为空')));
|
|
131
127
|
} else {
|
|
132
128
|
callback();
|
|
133
129
|
}
|
|
@@ -139,9 +135,9 @@ export default {
|
|
|
139
135
|
const password = this.user.password != undefined ? this.user.password : '';
|
|
140
136
|
|
|
141
137
|
if (isPassRequired && rePassword == '') {
|
|
142
|
-
callback(new Error('确认密码不能为空'));
|
|
138
|
+
callback(new Error(this.$t1('确认密码不能为空')));
|
|
143
139
|
} else if (rePassword != password) {
|
|
144
|
-
callback(new Error('两次输入密码不一致!'));
|
|
140
|
+
callback(new Error(this.$t1('两次输入密码不一致!')));
|
|
145
141
|
} else {
|
|
146
142
|
callback();
|
|
147
143
|
}
|
|
@@ -179,7 +175,7 @@ export default {
|
|
|
179
175
|
showCustomerDialog: false,
|
|
180
176
|
exportOption: {
|
|
181
177
|
prefix: USER_PREFIX,
|
|
182
|
-
title: '用户',
|
|
178
|
+
title: this.$t1('用户'),
|
|
183
179
|
codes: ["USEREXCEL", "USERPDF", "USERPRINT", "USERHIPRINT"],
|
|
184
180
|
param: () => {
|
|
185
181
|
return [{id: this.dataId}];
|
|
@@ -263,7 +259,7 @@ export default {
|
|
|
263
259
|
let loginAccount = this.user.loginAccount;
|
|
264
260
|
if (!loginAccount.startsWith('dev_')) {
|
|
265
261
|
this.$message({
|
|
266
|
-
message: '登录名必须以“dev_”开头',
|
|
262
|
+
message: this.$t1('登录名必须以“dev_”开头'),
|
|
267
263
|
type: 'error',
|
|
268
264
|
duration: 2000,
|
|
269
265
|
});
|
|
@@ -463,7 +459,7 @@ export default {
|
|
|
463
459
|
}
|
|
464
460
|
},
|
|
465
461
|
unlock() {
|
|
466
|
-
this.$baseConfirm('您确定要解锁吗？').then(() => {
|
|
462
|
+
this.$baseConfirm(this.$t1('您确定要解锁吗？')).then(() => {
|
|
467
463
|
var url = USER_PREFIX + '/user/unlockLoginAccount';
|
|
468
464
|
this.$http({
|
|
469
465
|
url: url,
|