@zscreate/zhxy-app-component 1.0.390 → 1.0.393

package/components/AIAutoFillForm/AIAutoFillForm.vue

@@ -160,13 +160,13 @@ export default {
           item.columns.forEach(el => {
             if(el.list && el.list.length) {
               el.list.forEach(el2 => {
-                if(['input', 'textarea', 'number', 'date', 'time'].includes(el2.type)) {
+                if(['input', 'textarea', 'number', 'date', 'time', 'select', 'radio', 'checkbox', 'cascaderSelect', 'cascader', 'deptSelector', 'userSelector', 'userSelectorByRole'].includes(el2.type)) {
                   this.formList.push(el2)
                 }
               })
             }
           })
-        } else if (['input', 'textarea', 'number', 'date', 'time'].includes(item.type)) { //输入框
+        } else if (['input', 'textarea', 'number', 'date', 'time', 'select', 'radio', 'checkbox', 'cascaderSelect', 'cascader', 'deptSelector', 'userSelector', 'userSelectorByRole'].includes(item.type)) { //输入框
           this.formList.push(item)
         }
       })
@@ -285,7 +285,9 @@ export default {
     async recognizeField(field) {
       const params = {
         content: this.contentText.trim(),
-        keyword: field.name
+        name: field.name,
+        type: field.type,
+        options: field.options
       };
       
       try {

package/components/form-container/form-container.vue

@@ -946,6 +946,9 @@ export default {
                 this.tableModel[tableModel]["options"]["defaultValue"] = this.models[
                     gen.model
                     ];
+                    if (gen.options.defaultAddRow && (!this.models[gen.model] || (Array.isArray(this.models[gen.model]) && this.models[gen.model].length === 0))) {
+                    this.addToTableData(gen, gen.model, 'addModel')
+                  }
                 this.tableInitByModel(tableModel);
             }
         },
@@ -1481,12 +1484,13 @@ export default {
                 }
             })
             // 子表单有必填校验 判断有没有添加行， 没有添加行需要手动添加行， 让它触发校验
-            //tables.forEach(table => {
-            //    const model = this.models[table.model]
-            //    if ( !model || ( Array.isArray(model) && model.length === 0 )) {
-            //        this.addToTableData(table, table.model, 'addModel')
-            //    }
-            //})
+            tables.forEach(table => {
+                if (!table.options.requiredAddDefaultRow) return
+                const model = this.models[table.model]
+                if ( !model || ( Array.isArray(model) && model.length === 0 )) {
+                    this.addToTableData(table, table.model, 'addModel')
+                }
+            })
         },
         /**
          * @param {回调函数} fn 成功的回调函数
@@ -1560,7 +1564,7 @@ export default {
                       item = this.models[widget.model]
                       if (item && widget) {
                         let rules =  {
-                          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: '请输入审批意见' }],
+                          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: '请输入审批意见' }],
                           operation: widget.type === 'hnkj-confirm' ? [ { required: widget.options.required , message: `请选择${widget.options.operation}` }] : []
                         }
                         utils.validateField(item, rules , Object.keys(rules), (success, errors) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.390",
+	"version": "1.0.393",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",