@zscreate/zhxy-app-component 1.0.241 → 1.0.243

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

@@ -1413,6 +1413,7 @@ export default {
           this.dataModel = value
         }
       }
+      this.replaceScriptDefaultValue()
     },
     tableValueSet(val) {
       var cloneArr = this.models[this.tableKey];
@@ -1780,6 +1781,7 @@ export default {
     },
     dataModel: {
       handler(v) {
+        v = this.replaceScriptDefaultValue(v)
         if (this.tableKey) {
           this.tableValueSet(v);
         } else {

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

@@ -5,17 +5,29 @@ export const valueChangeMixin = {
        dataModel: {
 		   immediate: true,
 		   handler() {
-			   let defaultValue = this.widget.options?.defaultValue
-			   if (String(defaultValue).startsWith('script:')) {
-			     defaultValue = defaultValue.replace('script:', '')
-			     const tempValue = {value: ''}
-			     run(`tempValue.value = ${defaultValue}`, {'this': this, tempValue})
-			     this.dataModel = tempValue.value
-			   }
+			   this.replaceScriptDefaultValue()
 		   },
-	   }
+	   },
+		widget: {
+			immediate: true,
+			handler() {
+				this.replaceScriptDefaultValue()
+			},
+		}
 	},
 	methods: {
+		replaceScriptDefaultValue(v) {
+			let defaultValue = this.widget.options?.defaultValue
+			if (String(defaultValue).startsWith('script:')) {
+				defaultValue = defaultValue.replace('script:', '')
+				const tempValue = {value: ''}
+				run(`tempValue.value = ${defaultValue}`, {'this': this, tempValue})
+				this.dataModel = tempValue.value
+				return this.dataModel
+
+			}
+			return v
+		},
 		/**文件dataModal**/
 		filePost(val) {
 			if (!Array.isArray(this.dataModel)) this.dataModel = []

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

@@ -561,9 +561,13 @@ export default {
                 let addModelObject = {};
                 dataTemp.columns.forEach(item => {
                     item.options.isCorrect = false;
+                    let defaultValue  = item.options.defaultValue
+                    if (String(defaultValue).startsWith('script:')) {
+                      defaultValue = ''
+                    }
                     addModelObject[item.model] = item.defaultValue ?
                         item.defaultValue :
-                        item.options.defaultValue;
+                        defaultValue;
                 });
                 if(!this.models[model]) this.models[model] = [] 
                 this.models[model].push(addModelObject);
@@ -601,7 +605,6 @@ export default {
                 this.models[model] instanceof Array &&
                 this.models[model].length > 0
             ) {
-              debugger
                 // console.log('--',this.tableModel[model], model)
                 this.models[model].forEach((item, index) => {
                     this.originIndex++;
@@ -688,8 +691,13 @@ export default {
                         } else {
                             // console.log('TO-JSON==',JSON.stringify(this.models));
                             // console.log(genList[i].model);
-                            let default_value = genList[i].options.defaultValue ? genList[i].options.defaultValue :
+                            let default_value = genList[i].options.defaultValue
+                            if (String(default_value).startsWith('script:')) {
+                              default_value = ''
+                            }
+                            default_value = default_value ? default_value :
                                 '' // 避免默认值为null
+
                             this.$set(this.models, genList[i].model, this.models[genList[i].model] ?
                                 this.models[genList[i].model] : default_value
                             )

package/package.json

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

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

@@ -1,15 +0,0 @@
-import {toAwait} from "../../../utils/util";
-import Vue from 'vue'
-export default {
-  methods: {
-    async getOpenId() {
-      let openId = Vue.prototype._openId
-      if (openId) return Promise.resolve(openId)
-
-      const [ err , res ] = await  toAwait(this.$u.get('/sys/user/getUserPublicOpenId'))
-      openId = await this.$async_encryption(res.result)
-      Vue.prototype._openId = openId
-      return openId
-    },
-  }
-}