cloud-web-corejs 1.0.54-dev.724 → 1.0.54-dev.727
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/vb-tabs/x-tabs.vue +3 -2
- package/src/components/wf/content.vue +1 -1
- package/src/components/wf/wf.js +16 -1
- package/src/components/wf/wfUtil.js +1 -1
- package/src/components/xform/XFormTabContainer//346/226/260/345/242/236/351/241/265/347/255/276/346/250/241/345/274/217-/346/234/200/347/273/210/345/256/236/347/216/260.md +195 -0
- package/src/components/xform/form-designer/designer.js +4 -0
- package/src/components/xform/form-designer/form-widget/field-widget/button-widget.vue +76 -66
- package/src/components/xform/form-designer/form-widget/field-widget/download-button-widget.vue +0 -1
- package/src/components/xform/form-designer/form-widget/field-widget/import-button-widget.vue +1 -1
- package/src/components/xform/form-designer/form-widget/field-widget/import2-button-widget.vue +1 -1
- package/src/components/xform/form-designer/form-widget/field-widget/table-export-button-widget.vue +1 -1
- package/src/components/xform/form-designer/setting-panel/form-setting.vue +31 -0
- package/src/components/xform/form-render/container-item/data-table-mixin.js +18 -0
- package/src/components/xform/form-render/container-item/detail-item.vue +107 -3
- package/src/components/xform/form-render/indexMixin.js +95 -1
- package/src/components/xform/mixins/defaultHandle.js +16 -0
- package/src/components/xform/mixins/scriptHttp.js +3 -0
- package/src/components/xform/utils/util.js +4 -0
- package/src/layout/components/AppMain.vue +2 -1
- package/src/views/user/form/view/list.vue +164 -11
- package/src/views/user/position/list.vue +68 -108
- package/src/components/xform/XFormTabContainer/IMPLEMENTATION_PLAN.md +0 -1079
- package/src/components/xform/XFormTabContainer//346/226/260/345/242/236/351/241/265/347/255/276/346/250/241/345/274/217-/350/220/275/345/234/260/345/256/236/346/226/275/346/226/207/346/241/243.md +0 -232
- package/src/components/xform/XFormTabContainer//346/226/260/345/242/236/351/241/265/347/255/276/346/250/241/345/274/217/345/256/236/347/216/260/346/226/271/346/241/210.md +0 -511
- package/src/components/xform/form-designer/form-widget/field-widget/tableexportbuttonwidget.vue +0 -99
|
@@ -2,70 +2,35 @@
|
|
|
2
2
|
<div id="containt">
|
|
3
3
|
<el-tabs v-model="activeName" class="tab-box">
|
|
4
4
|
<el-tab-pane :label="$t1('常规')" name="first">
|
|
5
|
-
<editView
|
|
6
|
-
|
|
7
|
-
visible-key="showEdit"
|
|
8
|
-
:_dataId.sync="dataId"
|
|
9
|
-
:parent-target="_self"
|
|
10
|
-
@reload="$reloadHandle"
|
|
11
|
-
></editView>
|
|
5
|
+
<editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
|
|
6
|
+
@reload="$reloadHandle"></editView>
|
|
12
7
|
</el-tab-pane>
|
|
13
8
|
<el-tab-pane :label="$t1('列表')" name="second">
|
|
14
9
|
<div class="grid-height">
|
|
15
|
-
<vxe-grid
|
|
16
|
-
|
|
17
|
-
v-bind="vxeOption"
|
|
18
|
-
@resizable-change="$vxeTableUtil.onColumnWitchChange"
|
|
19
|
-
@custom="$vxeTableUtil.customHandle"
|
|
20
|
-
>
|
|
10
|
+
<vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
|
|
11
|
+
@custom="$vxeTableUtil.customHandle">
|
|
21
12
|
<template #form>
|
|
22
13
|
<div class="clearfix screen-btns">
|
|
23
14
|
<div class="fl">
|
|
24
|
-
<vxe-button
|
|
25
|
-
|
|
26
|
-
class="button-sty"
|
|
27
|
-
icon="el-icon-plus"
|
|
28
|
-
@click="openEditDialog"
|
|
29
|
-
>
|
|
30
|
-
{{ $t1("新增") }}
|
|
15
|
+
<vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
|
|
16
|
+
{{ $t1('新增') }}
|
|
31
17
|
</vxe-button>
|
|
32
|
-
<base-table-export
|
|
33
|
-
:option="{ title: $t1('岗位导出'), targetRef: 'table-m1' }"
|
|
34
|
-
:parent-target="_self"
|
|
35
|
-
/>
|
|
18
|
+
<base-table-export :option="{ title: $t1('岗位导出'), targetRef: 'table-m1'}" :parent-target="_self"/>
|
|
36
19
|
</div>
|
|
37
20
|
<div class="fr">
|
|
38
|
-
<vxe-button
|
|
39
|
-
|
|
40
|
-
class="button-sty"
|
|
41
|
-
@click="resetEvent"
|
|
42
|
-
type="text"
|
|
43
|
-
status="primary"
|
|
44
|
-
plain
|
|
45
|
-
>{{ $t1("重置") }}
|
|
21
|
+
<vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
|
|
22
|
+
plain>{{ $t1('重置') }}
|
|
46
23
|
</vxe-button>
|
|
47
|
-
<vxe-button
|
|
48
|
-
|
|
49
|
-
icon="el-icon-search"
|
|
50
|
-
class="button-sty"
|
|
51
|
-
@click="searchEvent"
|
|
52
|
-
>
|
|
53
|
-
{{ $t1("搜索") }}
|
|
24
|
+
<vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
|
|
25
|
+
{{ $t1('搜索') }}
|
|
54
26
|
</vxe-button>
|
|
55
27
|
</div>
|
|
56
28
|
</div>
|
|
57
|
-
<vxe-form
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
title-width="92px"
|
|
61
|
-
title-align="right"
|
|
62
|
-
:data="formData"
|
|
63
|
-
@submit="searchEvent"
|
|
64
|
-
@reset="searchEvent"
|
|
65
|
-
>
|
|
66
|
-
<vxe-form-item :title="$t1('岗位名称') + ':'" field="name">
|
|
29
|
+
<vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
|
|
30
|
+
@submit="searchEvent" @reset="searchEvent">
|
|
31
|
+
<vxe-form-item :title="$t1('岗位名称')+':'" field="name">
|
|
67
32
|
<template v-slot>
|
|
68
|
-
<el-input v-model="formData.name" size="small" clearable
|
|
33
|
+
<el-input v-model="formData.name" size="small" clearable/>
|
|
69
34
|
</template>
|
|
70
35
|
</vxe-form-item>
|
|
71
36
|
<!-- <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
|
|
@@ -83,18 +48,18 @@
|
|
|
83
48
|
</template>
|
|
84
49
|
|
|
85
50
|
<script>
|
|
86
|
-
import editView from
|
|
51
|
+
import editView from './edit.vue';
|
|
87
52
|
|
|
88
53
|
export default {
|
|
89
|
-
name:
|
|
90
|
-
components: {
|
|
54
|
+
name: 'position:list',
|
|
55
|
+
components: {editView},
|
|
91
56
|
data() {
|
|
92
57
|
return {
|
|
93
|
-
activeName:
|
|
58
|
+
activeName: 'second',
|
|
94
59
|
dataId: 0,
|
|
95
60
|
showEdit: false,
|
|
96
61
|
vxeOption: {},
|
|
97
|
-
formData: {}
|
|
62
|
+
formData: {}
|
|
98
63
|
};
|
|
99
64
|
},
|
|
100
65
|
mounted() {
|
|
@@ -102,85 +67,85 @@ export default {
|
|
|
102
67
|
},
|
|
103
68
|
methods: {
|
|
104
69
|
searchEvent() {
|
|
105
|
-
this.$refs[
|
|
70
|
+
this.$refs['table-m1'].commitProxy('reload');
|
|
106
71
|
},
|
|
107
72
|
resetEvent() {
|
|
108
73
|
this.formData = {};
|
|
109
|
-
this.$refs[
|
|
74
|
+
this.$refs['table-m1'].commitProxy('reload');
|
|
110
75
|
},
|
|
111
76
|
openEditDialog(id) {
|
|
112
|
-
this.dataId = !id || typeof id ==
|
|
113
|
-
this.activeName =
|
|
114
|
-
this.$openEditView(
|
|
77
|
+
this.dataId = !id || typeof id == 'object' ? 0 : id;
|
|
78
|
+
this.activeName = 'first';
|
|
79
|
+
this.$openEditView('showEdit');
|
|
115
80
|
},
|
|
116
81
|
initTableList() {
|
|
117
82
|
let that = this;
|
|
118
83
|
let tableOption = {
|
|
119
84
|
vue: this,
|
|
120
|
-
tableRef:
|
|
121
|
-
tableName:
|
|
122
|
-
path: USER_PREFIX +
|
|
85
|
+
tableRef: 'table-m1',
|
|
86
|
+
tableName: 'basic_position_list-m2',
|
|
87
|
+
path: USER_PREFIX + '/position/listCurrentPage',
|
|
123
88
|
param: () => {
|
|
124
89
|
return this.formData;
|
|
125
90
|
},
|
|
126
91
|
columns: [
|
|
127
|
-
{
|
|
92
|
+
{type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
|
|
128
93
|
{
|
|
129
|
-
title: this.$t1(
|
|
130
|
-
field:
|
|
94
|
+
title: this.$t1('岗位名称'),
|
|
95
|
+
field: 'name',
|
|
131
96
|
width: 150,
|
|
132
|
-
fixed:
|
|
97
|
+
fixed: 'left'
|
|
133
98
|
},
|
|
134
99
|
/* {
|
|
135
100
|
field: 'code',
|
|
136
101
|
title: this.$t1('岗位编码'),
|
|
137
102
|
width: 250
|
|
138
103
|
}, */
|
|
139
|
-
{
|
|
104
|
+
{title: this.$t1('所属组织'), field: 'companyName', width: 150},
|
|
140
105
|
{
|
|
141
|
-
field:
|
|
142
|
-
title: this.$t1(
|
|
106
|
+
field: 'enabled',
|
|
107
|
+
title: this.$t1('是否启用'),
|
|
143
108
|
width: 150,
|
|
144
109
|
slots: {
|
|
145
|
-
default: ({
|
|
110
|
+
default: ({row}) => {
|
|
146
111
|
if (row.enabled) {
|
|
147
112
|
return [
|
|
148
113
|
<div class="txt-status">
|
|
149
|
-
<span>{this.$t1(
|
|
150
|
-
</div
|
|
114
|
+
<span>{this.$t1('启用')}</span>
|
|
115
|
+
</div>
|
|
151
116
|
];
|
|
152
117
|
} else {
|
|
153
118
|
return [
|
|
154
119
|
<div class="txt-status disable">
|
|
155
|
-
<span>{this.$t1(
|
|
156
|
-
</div
|
|
120
|
+
<span>{this.$t1('禁用')}</span>
|
|
121
|
+
</div>
|
|
157
122
|
];
|
|
158
123
|
}
|
|
159
|
-
}
|
|
160
|
-
}
|
|
124
|
+
}
|
|
125
|
+
}
|
|
161
126
|
},
|
|
162
127
|
{
|
|
163
|
-
field:
|
|
164
|
-
title: this.$t1(
|
|
165
|
-
width: 150
|
|
128
|
+
field: 'createDate',
|
|
129
|
+
title: this.$t1('创建时间'),
|
|
130
|
+
width: 150
|
|
166
131
|
},
|
|
167
132
|
{
|
|
168
|
-
field:
|
|
169
|
-
title: this.$t1(
|
|
170
|
-
width: 150
|
|
133
|
+
field: '_createBy',
|
|
134
|
+
title: this.$t1('创建人'),
|
|
135
|
+
width: 150
|
|
171
136
|
},
|
|
172
137
|
{
|
|
173
|
-
field:
|
|
174
|
-
title: this.$t1(
|
|
175
|
-
width: 150
|
|
138
|
+
field: '_modifyBy',
|
|
139
|
+
title: this.$t1('更新人'),
|
|
140
|
+
width: 150
|
|
176
141
|
},
|
|
177
142
|
{
|
|
178
143
|
width: 47,
|
|
179
|
-
fixed:
|
|
180
|
-
title:
|
|
144
|
+
fixed: 'right',
|
|
145
|
+
title: '',
|
|
181
146
|
sortable: false,
|
|
182
147
|
slots: {
|
|
183
|
-
default: ({
|
|
148
|
+
default: ({row}) => {
|
|
184
149
|
return [
|
|
185
150
|
<div>
|
|
186
151
|
<a
|
|
@@ -190,24 +155,19 @@ export default {
|
|
|
190
155
|
this.openEditDialog(row.id);
|
|
191
156
|
}}
|
|
192
157
|
>
|
|
193
|
-
<el-tooltip
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
content={this.$t1("查看")}
|
|
197
|
-
placement="top"
|
|
198
|
-
popper-class="tooltip-skin"
|
|
199
|
-
>
|
|
200
|
-
<i class="el-icon-edit" />
|
|
158
|
+
<el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
|
|
159
|
+
popper-class="tooltip-skin">
|
|
160
|
+
<i class="el-icon-edit"/>
|
|
201
161
|
</el-tooltip>
|
|
202
162
|
</a>
|
|
203
|
-
</div
|
|
163
|
+
</div>
|
|
204
164
|
];
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
]
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
]
|
|
209
169
|
};
|
|
210
|
-
this.$vxeTableUtil.initVxeTable(tableOption).then(
|
|
170
|
+
this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
|
|
211
171
|
this.vxeOption = opts;
|
|
212
172
|
});
|
|
213
173
|
},
|
|
@@ -215,14 +175,14 @@ export default {
|
|
|
215
175
|
let that = this;
|
|
216
176
|
that.$excelImport({
|
|
217
177
|
prefix: USER_PREFIX,
|
|
218
|
-
excel: USER_PREFIX +
|
|
178
|
+
excel: USER_PREFIX + '/excelTemplate/position/position.xlsx',
|
|
219
179
|
multi: false,
|
|
220
|
-
saveUrl: USER_PREFIX +
|
|
180
|
+
saveUrl: USER_PREFIX + '/position/save',
|
|
221
181
|
callback: () => {
|
|
222
182
|
that.searchEvent();
|
|
223
|
-
}
|
|
183
|
+
}
|
|
224
184
|
});
|
|
225
|
-
}
|
|
226
|
-
}
|
|
185
|
+
}
|
|
186
|
+
}
|
|
227
187
|
};
|
|
228
188
|
</script>
|