@zscreate/zhxy-app-component 1.0.390 → 1.0.392
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.
|
@@ -160,13 +160,13 @@ export default {
|
|
|
160
160
|
item.columns.forEach(el => {
|
|
161
161
|
if(el.list && el.list.length) {
|
|
162
162
|
el.list.forEach(el2 => {
|
|
163
|
-
if(['input', 'textarea', 'number', 'date', 'time'].includes(el2.type)) {
|
|
163
|
+
if(['input', 'textarea', 'number', 'date', 'time', 'select', 'radio', 'checkbox', 'cascaderSelect', 'cascader', 'deptSelector', 'userSelector', 'userSelectorByRole'].includes(el2.type)) {
|
|
164
164
|
this.formList.push(el2)
|
|
165
165
|
}
|
|
166
166
|
})
|
|
167
167
|
}
|
|
168
168
|
})
|
|
169
|
-
} else if (['input', 'textarea', 'number', 'date', 'time'].includes(item.type)) { //输入框
|
|
169
|
+
} else if (['input', 'textarea', 'number', 'date', 'time', 'select', 'radio', 'checkbox', 'cascaderSelect', 'cascader', 'deptSelector', 'userSelector', 'userSelectorByRole'].includes(item.type)) { //输入框
|
|
170
170
|
this.formList.push(item)
|
|
171
171
|
}
|
|
172
172
|
})
|
|
@@ -285,7 +285,9 @@ export default {
|
|
|
285
285
|
async recognizeField(field) {
|
|
286
286
|
const params = {
|
|
287
287
|
content: this.contentText.trim(),
|
|
288
|
-
|
|
288
|
+
name: field.name,
|
|
289
|
+
type: field.type,
|
|
290
|
+
options: field.options
|
|
289
291
|
};
|
|
290
292
|
|
|
291
293
|
try {
|
|
@@ -1481,12 +1481,13 @@ export default {
|
|
|
1481
1481
|
}
|
|
1482
1482
|
})
|
|
1483
1483
|
// 子表单有必填校验 判断有没有添加行, 没有添加行需要手动添加行, 让它触发校验
|
|
1484
|
-
|
|
1485
|
-
|
|
1486
|
-
|
|
1487
|
-
|
|
1488
|
-
|
|
1489
|
-
|
|
1484
|
+
tables.forEach(table => {
|
|
1485
|
+
if (!table.options.requiredAddDefaultRow) return
|
|
1486
|
+
const model = this.models[table.model]
|
|
1487
|
+
if ( !model || ( Array.isArray(model) && model.length === 0 )) {
|
|
1488
|
+
this.addToTableData(table, table.model, 'addModel')
|
|
1489
|
+
}
|
|
1490
|
+
})
|
|
1490
1491
|
},
|
|
1491
1492
|
/**
|
|
1492
1493
|
* @param {回调函数} fn 成功的回调函数
|
|
@@ -1560,7 +1561,7 @@ export default {
|
|
|
1560
1561
|
item = this.models[widget.model]
|
|
1561
1562
|
if (item && widget) {
|
|
1562
1563
|
let rules = {
|
|
1563
|
-
comments: widget.type === 'hnkj-confirm' ? widget.options.isConfirmComponent?[{ required: widget.options.confirmOpinionRequire, message: '请输入确认意见' }]:[ { required: widget.options.required , message: widget.options.placeholder }] : [{ required: widget.options.opinionRequire, message: '请输入审批意见' }],
|
|
1564
|
+
comments: widget.type === 'hnkj-confirm' ? (widget.options.isConfirmComponent?[{ required: widget.options.confirmOpinionRequire, message: '请输入确认意见' }]:[ { required: widget.options.required , message: widget.options.placeholder }]) : [{ required: widget.options.opinionRequire, message: '请输入审批意见' }],
|
|
1564
1565
|
operation: widget.type === 'hnkj-confirm' ? [ { required: widget.options.required , message: `请选择${widget.options.operation}` }] : []
|
|
1565
1566
|
}
|
|
1566
1567
|
utils.validateField(item, rules , Object.keys(rules), (success, errors) => {
|