cloud-web-corejs 1.0.54-dev.125 → 1.0.54-dev.127
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-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue +1051 -1051
- package/src/components/xform/form-designer/setting-panel/property-editor/formScriptEnabled-editor.vue +7 -7
- package/src/components/xform/form-render/container-item/data-table-mixin.js +2113 -1
- package/src/components/xform/lang/zh-CN.js +1 -1
- package/src/layout/components/extractedCode/createDialog.vue +2 -2
- package/src/views/bd/setting/form_import_log/edit.vue +11 -5
- package/src/views/bd/setting/form_import_log/list.vue +12 -3
- package/src/views/bd/setting/form_template/mixins/list.js +608 -543
- package/src/views/bd/setting/table_model/mixins/list.js +18 -1
- package/src/views/user/position/list.vue +4 -4
- package/src/views/user/role/list.vue +4 -4
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
<el-form ref="editCategoryForm" :model="formData" label-width="102px" class="adSearchForm" style="min-height: 150px; width: auto;">
|
|
17
17
|
<el-form-item :label="$t1('类型')">
|
|
18
18
|
<el-select v-model="formData.objType" class="all-width">
|
|
19
|
-
<el-option value="FormTemplate" :label="$t1('
|
|
20
|
-
<el-option value="FormScript" :label="$t1('
|
|
19
|
+
<el-option value="FormTemplate" :label="$t1('表单模板')"></el-option>
|
|
20
|
+
<el-option value="FormScript" :label="$t1('逻辑脚本')"></el-option>
|
|
21
21
|
<el-option value="TableTemplate" :label="$t1('数据表')"></el-option>
|
|
22
22
|
</el-select>
|
|
23
23
|
</el-form-item>
|
|
@@ -44,20 +44,22 @@
|
|
|
44
44
|
</tr>
|
|
45
45
|
<tr>
|
|
46
46
|
<th>
|
|
47
|
-
<em class="f-red">*</em>
|
|
48
47
|
{{ $t1('导入时间') }}
|
|
49
48
|
</th>
|
|
50
49
|
<td>
|
|
51
50
|
{{ formImportLog.impDate }}
|
|
52
51
|
</td>
|
|
53
52
|
<th>
|
|
54
|
-
<em class="f-red">*</em>
|
|
55
53
|
{{ $t1('结果') }}
|
|
56
54
|
</th>
|
|
57
|
-
<td
|
|
58
|
-
{{ formImportLog.impReturnType }}
|
|
55
|
+
<td>
|
|
56
|
+
{{ impReturnTypeMap[formImportLog.impReturnType] }}
|
|
59
57
|
</td>
|
|
60
58
|
</tr>
|
|
59
|
+
<tr>
|
|
60
|
+
<th>{{ $t1('失败描述') }}</th>
|
|
61
|
+
<td colspan="7">{{ formImportLog.impReturnMsg }}</td>
|
|
62
|
+
</tr>
|
|
61
63
|
<tr>
|
|
62
64
|
<th>{{ $t1('创建人') }}</th>
|
|
63
65
|
<td>{{ formImportLog._createBy }}</td>
|
|
@@ -88,7 +90,11 @@ export default {
|
|
|
88
90
|
isEdit: false,
|
|
89
91
|
tabIndex: 'first',
|
|
90
92
|
dataId: '',
|
|
91
|
-
formImportLog: {}
|
|
93
|
+
formImportLog: {},
|
|
94
|
+
impReturnTypeMap: {
|
|
95
|
+
success: this.$t1('成功'),
|
|
96
|
+
fail: this.$t1('失败')
|
|
97
|
+
}
|
|
92
98
|
};
|
|
93
99
|
},
|
|
94
100
|
created() {
|
|
@@ -112,6 +112,10 @@ export default {
|
|
|
112
112
|
},
|
|
113
113
|
initTableList() {
|
|
114
114
|
let that = this;
|
|
115
|
+
let impReturnTypeMap = {
|
|
116
|
+
success: this.$t1('成功'),
|
|
117
|
+
fail: this.$t1('失败')
|
|
118
|
+
}
|
|
115
119
|
let tableOption = {
|
|
116
120
|
vue: this,
|
|
117
121
|
tableRef: 'table-m1',
|
|
@@ -144,15 +148,20 @@ export default {
|
|
|
144
148
|
}
|
|
145
149
|
},
|
|
146
150
|
{
|
|
147
|
-
field: '
|
|
151
|
+
field: 'impReturnType',
|
|
148
152
|
title: this.$t1('结果'),
|
|
149
|
-
width:
|
|
153
|
+
width: 150,
|
|
150
154
|
slots: {
|
|
151
155
|
default: ({row}) => {
|
|
152
|
-
return
|
|
156
|
+
return impReturnTypeMap[row.impReturnType];
|
|
153
157
|
}
|
|
154
158
|
}
|
|
155
159
|
},
|
|
160
|
+
{
|
|
161
|
+
field: 'impReturnMsg',
|
|
162
|
+
title: this.$t1('失败描述'),
|
|
163
|
+
width: 250
|
|
164
|
+
},
|
|
156
165
|
{
|
|
157
166
|
field: 'impDate',
|
|
158
167
|
title: this.$t1('导入时间'),
|