@zscreate/zhxy-app-component 1.0.387 → 1.0.392

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

@@ -116,15 +116,10 @@
                                     </view>
                                     <view v-if="col.model == verifyNode" class="verify-cot">
                                         <view class="verify-title">{{col.options.operation}}</view>
-                                        <view style="width:200rpx; flex-shrink: 0">
-                                            <u-input id="suggestSelect" :border="false" type="select" :select-open="selectShow[col.model]"
-                                                     input-align="right" v-model="suggestType[col.model]" placeholder="请点击选择"
-                                                     @click="selectShow[col.model] = true"></u-input>
-                                            <u-select mode="single-column" :list="selectList[col.model]" v-model="selectShow[col.model]"
-                                                      @confirm="selectConfirm($event,col)"></u-select>
-                                            <!-- <picker @change="bindPickerChange($event, item.model)" :value="pickerIndex" :range="selectDataTransForm(suggest)">
-                                              <view class="uni-input">{{models[item.model].operation ? models[item.model].operation : '请选择'}}</view>
-                                            </picker> -->
+                                        <view id="suggestSelect" style="width:200rpx; flex-shrink: 0; text-align: right; font-size: 26rpx; color: #333; line-height: 60rpx;"
+                                              @click="openSuggestSelect(col)">
+                                            {{suggestType[col.model] || '请点击选择'}}
+                                            <text style="font-size: 24rpx; color: #999; margin-left: 4rpx;">▼</text>
                                         </view>
                                     </view>
                                     <view v-if="col.model !== verifyNode" class="verify-cot">
@@ -220,15 +215,10 @@
 			<!-- #endif  -->
                         <view v-if="!warpVerifyDisable(item)" class="verify-cot">
                             <view class="verify-title">{{item.options.operation}}</view>
-                            <view style="width:200rpx; flex-shrink: 0">
-                                <u-input id="suggestSelect" :border="false" type="select" :select-open="selectShow[item.model]"
-                                         input-align="right" v-model="suggestType[item.model]" placeholder="请点击选择"
-                                         @click="selectShow[item.model] = true"></u-input>
-                                <u-select mode="single-column" :list="selectList[item.model]" v-model="selectShow[item.model]"
-                                          @confirm="selectConfirm($event,item)"></u-select>
-                                <!-- <picker @change="bindPickerChange($event, item.model)" :value="pickerIndex" :range="selectDataTransForm(suggest)">
-                                  <view class="uni-input">{{models[item.model].operation ? models[item.model].operation : '请选择'}}</view>
-                                </picker> -->
+                            <view id="suggestSelect" style="width:200rpx; flex-shrink: 0; text-align: right; font-size: 26rpx; color: #333; line-height: 60rpx;"
+                                  @click="openSuggestSelect(item)">
+                                {{suggestType[item.model] || '请点击选择'}}
+                                <text style="font-size: 24rpx; color: #999; margin-left: 4rpx;">▼</text>
                             </view>
                         </view>
                         <view v-if="warpVerifyDisable(item)" class="verify-cot">
@@ -750,6 +740,17 @@ export default {
             }
           })
         },
+        // 打开操作类型选择
+        openSuggestSelect(item) {
+            const list = this.selectList[item.model] || this.suggest || [];
+            if (list.length === 0) return;
+            uni.showActionSheet({
+                itemList: list.map(opt => opt.label || opt.value),
+                success: (res) => {
+                    this.selectConfirm([list[res.tapIndex]], item);
+                }
+            });
+        },
         // 选择操作类型
         selectConfirm(e, item) {
             const { model, options, type } = item
@@ -1480,12 +1481,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 成功的回调函数
@@ -1559,7 +1561,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.387",
+	"version": "1.0.392",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",