@zscreate/zhxy-app-component 1.0.304 → 1.0.305

package/components/evan-form-item/evan-form-item.vue

@@ -510,7 +510,8 @@
       <view class="evan-form-item-container__main " :style="mContentStyle" style="width: 100%;box-sizing: border-box">
         <rich-text v-if="widget.options.disabled" :nodes="dataModel" style="width: 100%;"></rich-text>
         <richEditor v-else v-model="dataModel" :widget="widget"
-          :maxLength="widget.options.wordLimits ? widget.options.maxLength : 0" style="width: 100%;">
+          :maxLength="widget.options.wordLimits ? widget.options.maxLength : 0" style="width: 100%;"
+          ref="richEditor">
         </richEditor>
       </view>
     </view>
@@ -1487,9 +1488,9 @@ export default {
           let arr = res.result
           global.dictData[this.widget.model] =  arr.map(item => {
             return {
-              value: item.dataValue || item.id,
-              label: item.dataKey || item.departName,
-              text: item.dataKey || item.departName
+              value: item.dataKey || item.id,
+              label: item.dataValue || item.departName,
+              text: item.dataValue || item.departName
             }
           })
           if (this.widget.type == 'select') {

package/components/evan-form-item/mixins/pubSubMixin.js

@@ -195,6 +195,15 @@ export const pubSubMixin = {
 					}else if(this.widget.type == "hnkj-richEditor"){
 						if(typeof data.updateValue == "string"){
 							this.dataModel = data.updateValue;
+							this.$refs.richEditor.formLinkSetContents(this.dataModel);
+						}
+					}else if(this.widget.type == "slider"){
+						if(data.updateValue*1 >= this.widget.options.max){
+							this.dataModel = this.widget.options.max;
+						}else if(data.updateValue*1 <= this.widget.options.min){
+							this.dataModel = this.widget.options.min;
+						}else{
+							this.dataModel = data.updateValue;
 						}
 					}else{
 						this.dataModel = data.updateValue

package/components/evan-form-item/mixins/validateFormMixin.js

@@ -74,6 +74,11 @@ export const validateFormMixin = {
 					return false;
 				}
 			}
+			// 表单联动之后，部分组件产生了必填校验，但是部分组件实际无需校验，故直接放开相关校验
+			if(["switch"].includes(this.widget.type)){
+				callback(null);
+				return false;
+			}
 			utils.validateItem(rules, props, tempModel[this.widget.model], callback)
 		},
 

package/components/rich-editor/index.vue

@@ -114,9 +114,9 @@
     watch: {
       value(val) {
         if (this.editorCtx) {
-          this.editorCtx.setContents({
-            html: val
-          })
+        //   this.editorCtx.setContents({
+        //     html: val
+        //   })
         }
       }
     },
@@ -144,6 +144,11 @@
 				});
 				this.$forceUpdate();
 			},
+			formLinkSetContents(value){
+				this.editorCtx.setContents({
+					html: value,
+				})
+			},
 			onEditorReady() {
           uni.createSelectorQuery().in(this).select('#editor').context((res) => {
             this.editorCtx = res.context;
@@ -167,7 +172,7 @@
             })
             setTimeout(() => {
               this.readOnly = false
-            }, 1000)
+            }, 200)
 
           }).exec();
 

package/package.json

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