mooho-base-admin-plus 2.5.2 → 2.5.4
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/history.md +2 -0
- package/package/mooho-base-admin-plus.min.esm.js +22 -16
- package/package/mooho-base-admin-plus.min.js +4 -4
- package/package/style.css +1 -1
- package/package.json +1 -1
- package/src/api/model.js +2 -2
- package/src/components/view/column-edit.vue +2 -2
- package/src/components/view/table-filter.vue +5 -3
- package/src/components/view/view-form-draggable.vue +3 -3
- package/src/components/view/view-form.vue +2 -0
- package/src/components/view/view-table.vue +4 -2
- package/src/components/workflow/flow-chart.vue +1 -1
- package/src/pages/system/role.vue +1 -1
- package/src/pages/system/user.vue +1 -1
package/package.json
CHANGED
package/src/api/model.js
CHANGED
|
@@ -99,7 +99,7 @@ export default {
|
|
|
99
99
|
|
|
100
100
|
let data = {
|
|
101
101
|
...filter,
|
|
102
|
-
per:
|
|
102
|
+
per: 1000000,
|
|
103
103
|
returnType: 1,
|
|
104
104
|
viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
|
|
105
105
|
};
|
|
@@ -145,7 +145,7 @@ export default {
|
|
|
145
145
|
|
|
146
146
|
let data = {
|
|
147
147
|
...filter,
|
|
148
|
-
per:
|
|
148
|
+
per: 10000,
|
|
149
149
|
returnType: 3,
|
|
150
150
|
viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
|
|
151
151
|
};
|
|
@@ -269,7 +269,7 @@
|
|
|
269
269
|
</Col>
|
|
270
270
|
<Col v-bind="grid8" v-if="viewType == 'FormView'">
|
|
271
271
|
<FormItem label="栏目宽度" key="columnWidth" prop="columnWidth">
|
|
272
|
-
<Select v-model="data.columnWidth" clearable :transfer="true">
|
|
272
|
+
<Select v-model="data.columnWidth" :clearable="true" :transfer="true">
|
|
273
273
|
<Option v-for="item in getEnumList('ColumnWidth')" :key="item.id" :value="item.id">{{ item.name }}</Option>
|
|
274
274
|
</Select>
|
|
275
275
|
</FormItem>
|
|
@@ -286,7 +286,7 @@
|
|
|
286
286
|
</Col>
|
|
287
287
|
<Col v-bind="grid8">
|
|
288
288
|
<FormItem label="显示格式" key="displayFormat" prop="displayFormat">
|
|
289
|
-
<Select v-model="data.displayFormat" clearable :transfer="true">
|
|
289
|
+
<Select v-model="data.displayFormat" :clearable="true" :transfer="true">
|
|
290
290
|
<Option v-for="item in getDisplayFormats()" :key="item.id" :value="item.code">{{ item.name }}</Option>
|
|
291
291
|
</Select>
|
|
292
292
|
</FormItem>
|
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
:model-value="parseFilterData(data, column)"
|
|
29
29
|
@update:model-value="$event => setFilterData(data, column, $event)"
|
|
30
30
|
@on-keyup="$event => onKeyup($event)"
|
|
31
|
+
:clearable="true"
|
|
31
32
|
:style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
|
|
32
33
|
:placeholder="column.description"
|
|
33
34
|
/>
|
|
@@ -40,6 +41,7 @@
|
|
|
40
41
|
:model-value="parseFilterData(data, column)"
|
|
41
42
|
@update:model-value="$event => setFilterData(data, column, $event)"
|
|
42
43
|
@on-keyup="$event => onKeyup($event)"
|
|
44
|
+
:clearable="true"
|
|
43
45
|
:style="{ width: column.controlWidth == null ? '100px' : column.controlWidth + 'px' }"
|
|
44
46
|
:placeholder="column.description"
|
|
45
47
|
/>
|
|
@@ -49,7 +51,7 @@
|
|
|
49
51
|
size="small"
|
|
50
52
|
:model-value="parseFilterData(data, column)"
|
|
51
53
|
@update:model-value="$event => setFilterData(data, column, $event)"
|
|
52
|
-
clearable
|
|
54
|
+
:clearable="true"
|
|
53
55
|
:style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
|
|
54
56
|
:placeholder="column.description"
|
|
55
57
|
:transfer="true"
|
|
@@ -63,7 +65,7 @@
|
|
|
63
65
|
size="small"
|
|
64
66
|
:model-value="parseArrayFilterData(data, column)"
|
|
65
67
|
:multiple="true"
|
|
66
|
-
clearable
|
|
68
|
+
:clearable="true"
|
|
67
69
|
@update:model-value="$event => setArrayFilterData(data, column, $event)"
|
|
68
70
|
:style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
|
|
69
71
|
:placeholder="column.description"
|
|
@@ -106,7 +108,7 @@
|
|
|
106
108
|
size="small"
|
|
107
109
|
:model-value="parseFilterDataWithOther(data, column)"
|
|
108
110
|
@update:model-value="$event => setFilterDataWithOther(data, column, $event)"
|
|
109
|
-
clearable
|
|
111
|
+
:clearable="true"
|
|
110
112
|
:style="{ width: column.controlWidth == null ? '40%' : column.controlWidth + 'px' }"
|
|
111
113
|
:placeholder="column.description"
|
|
112
114
|
:transfer="true"
|
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
:model-value="parseData(data, column.code)"
|
|
94
94
|
@update:model-value="$event => setData(data, column.code, $event)"
|
|
95
95
|
:disabled="column.isReadonly"
|
|
96
|
-
clearable
|
|
96
|
+
:clearable="true"
|
|
97
97
|
:style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
|
|
98
98
|
:placeholder="column.description"
|
|
99
99
|
:transfer="true"
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
@update:model-value="$event => setArrayData(data, column.code, $event)"
|
|
109
109
|
:disabled="column.isReadonly"
|
|
110
110
|
:multiple="true"
|
|
111
|
-
clearable
|
|
111
|
+
:clearable="true"
|
|
112
112
|
:style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
|
|
113
113
|
:placeholder="column.description"
|
|
114
114
|
:transfer="true"
|
|
@@ -148,7 +148,7 @@
|
|
|
148
148
|
:model-value="parseDataWithOther(data, column)"
|
|
149
149
|
@update:model-value="$event => setDataWithOther(data, column.code, $event)"
|
|
150
150
|
:disabled="column.isReadonly"
|
|
151
|
-
clearable
|
|
151
|
+
:clearable="true"
|
|
152
152
|
:style="{ width: column.controlWidth == null ? '40%' : column.controlWidth + 'px' }"
|
|
153
153
|
:placeholder="column.description"
|
|
154
154
|
:transfer="true"
|
|
@@ -107,6 +107,7 @@
|
|
|
107
107
|
:model-value="parseData(data, column.code)"
|
|
108
108
|
@update:model-value="$event => setData(data, column.code, $event)"
|
|
109
109
|
:readonly="readonly || column.isReadonly"
|
|
110
|
+
:clearable="true"
|
|
110
111
|
:style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
|
|
111
112
|
:maxlength="column.maxLength"
|
|
112
113
|
:placeholder="column.description"
|
|
@@ -121,6 +122,7 @@
|
|
|
121
122
|
:model-value="parseData(data, column.code)"
|
|
122
123
|
@update:model-value="$event => setData(data, column.code, $event)"
|
|
123
124
|
:readonly="readonly || column.isReadonly"
|
|
125
|
+
:clearable="true"
|
|
124
126
|
:style="{ width: column.controlWidth == null ? '100px' : column.controlWidth + 'px' }"
|
|
125
127
|
:placeholder="column.description"
|
|
126
128
|
:max="column.maxValue"
|
|
@@ -141,6 +141,7 @@
|
|
|
141
141
|
:model-value="parseData(rowData(row, index), column.code)"
|
|
142
142
|
@update:model-value="$event => setData(rowData(row, index), column.code, $event)"
|
|
143
143
|
:readonly="isReadonly(rowData(row, index), column)"
|
|
144
|
+
:clearable="true"
|
|
144
145
|
:style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
|
|
145
146
|
:maxlength="column.maxLength"
|
|
146
147
|
:pattern="column.pattern"
|
|
@@ -170,6 +171,7 @@
|
|
|
170
171
|
:model-value="parseData(rowData(row, index), column.code)"
|
|
171
172
|
@update:model-value="$event => setData(rowData(row, index), column.code, $event)"
|
|
172
173
|
:readonly="isReadonly(rowData(row, index), column)"
|
|
174
|
+
:clearable="true"
|
|
173
175
|
:style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
|
|
174
176
|
:placeholder="column.description"
|
|
175
177
|
@on-change="onDataChange(rowData(row, index), column)"
|
|
@@ -182,7 +184,7 @@
|
|
|
182
184
|
:model-value="parseData(rowData(row, index), column.code)"
|
|
183
185
|
@update:model-value="$event => setData(rowData(row, index), column.code, $event)"
|
|
184
186
|
:disabled="isReadonly(rowData(row, index), column)"
|
|
185
|
-
clearable
|
|
187
|
+
:clearable="true"
|
|
186
188
|
:style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
|
|
187
189
|
:placeholder="column.description"
|
|
188
190
|
:transfer="true"
|
|
@@ -198,7 +200,7 @@
|
|
|
198
200
|
@update:model-value="$event => setArrayData(rowData(row, index), column.code, $event)"
|
|
199
201
|
:disabled="isReadonly(rowData(row, index), column)"
|
|
200
202
|
:multiple="true"
|
|
201
|
-
clearable
|
|
203
|
+
:clearable="true"
|
|
202
204
|
:style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
|
|
203
205
|
:placeholder="column.description"
|
|
204
206
|
:transfer="true"
|
|
@@ -336,7 +336,7 @@
|
|
|
336
336
|
</template>
|
|
337
337
|
<template #column="{ data, code }">
|
|
338
338
|
<template v-if="code == 'rejectActivityPid'">
|
|
339
|
-
<Select v-model="data[code]" clearable placeholder="退回发起人" :transfer="true" v-if="activities">
|
|
339
|
+
<Select v-model="data[code]" :clearable="true" placeholder="退回发起人" :transfer="true" v-if="activities">
|
|
340
340
|
<Option
|
|
341
341
|
v-for="item in activities.filter(item => {
|
|
342
342
|
return (
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
<Input type="number" size="small" number v-model="row.propertyValue" />
|
|
32
32
|
</template>
|
|
33
33
|
<template v-else-if="row.controlType === 'Select'">
|
|
34
|
-
<Select size="small" v-model="row.propertyValue" clearable :transfer="true">
|
|
34
|
+
<Select size="small" v-model="row.propertyValue" :clearable="true" :transfer="true">
|
|
35
35
|
<Option v-for="item in row._dataSource" :key="item.id" :value="item.id">{{ item.name }}</Option>
|
|
36
36
|
</Select>
|
|
37
37
|
</template>
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
<Input type="number" size="small" number v-model="row.propertyValue" />
|
|
36
36
|
</template>
|
|
37
37
|
<template v-else-if="row.controlType === 'Select'">
|
|
38
|
-
<Select size="small" v-model="row.propertyValue" clearable :transfer="true">
|
|
38
|
+
<Select size="small" v-model="row.propertyValue" :clearable="true" :transfer="true">
|
|
39
39
|
<Option v-for="item in row._dataSource" :key="item.id" :value="item.id">{{ item.name }}</Option>
|
|
40
40
|
</Select>
|
|
41
41
|
</template>
|