@zscreate/zhxy-app-component 1.0.119 → 1.0.120

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

@@ -0,0 +1,15 @@
+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
+    },
+  }
+}

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

@@ -294,6 +294,7 @@ export default {
                 if (this.dataObj && this.dataObj.list) {
                     this.rules = {};
                     this.generateModle(this.dataObj.list);
+                    this.updateFormDataToModels()
                     console.log(JSON.stringify(this.models))
                 }
             },
@@ -304,6 +305,8 @@ export default {
                 if (this.dataObj && this.dataObj.list) {
                     this.rules = {};
                     this.generateModle(this.dataObj.list);
+
+                    this.updateFormDataToModels()
                     console.log(this.models)
                     console.log(JSON.stringify(this.models))
                 }
@@ -334,6 +337,7 @@ export default {
 
     },
     mounted() {
+
         // 回显关联组件
         // setTimeout(() => {
         // 	this.getchildren()
@@ -356,6 +360,15 @@ export default {
         // this.initPo();
     },
     methods: {
+        updateFormDataToModels() {
+          // 将formData 中未绑定表单key 的数据也复制到models
+          const modelsKeys = Object.keys(this.models)
+          Object.keys(this.value).forEach(key => {
+            if (!modelsKeys.includes(key)) {
+              this.models[key] = this.value[key]
+            }
+          })
+        },
         verifyLogsList(model) {
             const list = this.verifyLogs[model]
             if (model !== this.verifyNode && list.length >= 1) return list.slice(0, list.length - 1)

package/components/l-file/l-file.vue

@@ -24,7 +24,7 @@
 </template>
 
 <script>
-	import {downloadFile} from "../../utils/util";
+import {downloadFile, getOpenId, toAwait} from "../../utils/util";
 
   export default {
 		props: {
@@ -51,6 +51,7 @@
 				percent: 0,
 				show: true,
         uploadIng: false,
+        openId: undefined,
 		    isShow:true,//是否展示点击上传
 			}
 		},
@@ -60,7 +61,10 @@
 				this.getShow(val)
 			}
 		},
-		mounted() {
+		async mounted() {
+      if (this.widget.options.uploadEncrypt) {
+        this.openId = await getOpenId()
+      }
 			if(this.disabled){
 				this.isShow =!this.disabled
 			}
@@ -84,7 +88,7 @@
 			downLoadFile(path, name, item) {
         let baseUrl = this.downLoadUrl
         if (this.widget.options.uploadEncrypt) {
-          path = '/sys/common/downloadZip?fileId=' + item.fileId
+          path = `/sys/common/downloadZip?fileId=${item.fileId}&openId=${this.openId}`
           baseUrl = process.uniEnv.BASE_API || process.uniEnv.apiUrl
         }
         downloadFile(baseUrl, { path, name })

package/components/uploadFile/uploadFile.vue

@@ -22,6 +22,8 @@
 </template>
 
 <script>
+import {getOpenId, toAwait} from "../../utils/util";
+
 var _self;
 export default {
   props: {
@@ -54,12 +56,16 @@ export default {
       emitList: [],
       uploadIng: false,
       showProgress: true,
+      openId: undefined,
       header: {
         'X-Access-Token': uni.getStorageSync('token') || this.$store.state.token || this.$store.getters.token
       },
     };
   },
-  created() {
+  async created() {
+    if (this.widget.options.uploadEncrypt) {
+      this.openId = await getOpenId()
+    }
     if (this.widget && Object.keys(this.widget).length > 0) {
       this.initWidget();
       this.showImage();
@@ -173,7 +179,6 @@ export default {
       })
     },
     onOversize() {
-      debugger
       uni.showToast({
         title: `文件超出${this.maxSize/1024}KB！`,
         icon: 'none',
@@ -191,7 +196,7 @@ export default {
               };
               tempItem.url = this.uniEnv.imgUrl + tempItem.url;
               if (tempItem.fileId) {
-                tempItem.url = (process.uniEnv.BASE_API || process.uniEnv.apiUrl) + '/sys/common/downloadZip?fileId=' + tempItem.fileId
+                tempItem.url = (process.uniEnv.BASE_API || process.uniEnv.apiUrl) + `/sys/common/downloadZip?fileId=${tempItem.fileId}&openId=${this.openId}`
               }
               return tempItem;
             })

package/package.json

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

package/utils/util.js

@@ -1,3 +1,4 @@
+import Vue from 'vue'
 function formatTime(time) {
 	if (typeof time !== 'number' || time < 0) {
 		return time
@@ -184,6 +185,15 @@ function downloadFile(downLoadUrl, { path, name }) {
  */
 const toAwait = promise => promise.then( res => [null, res ]).catch(error => [error])
 
+const getOpenId = async  function () {
+	let openId = Vue.prototype._openId
+	if (openId) return Promise.resolve(openId)
+
+	const [ err , res ] = await  toAwait(Vue.prototype.$u.get('/sys/user/getUserPublicOpenId'))
+	openId = await Vue.prototype.$async_encryption(res.result)
+	Vue.prototype._openId = openId
+	return openId
+}
 module.exports = {
 	formatTime: formatTime,
 	formatLocation: formatLocation,
@@ -191,5 +201,6 @@ module.exports = {
 	toAwait,
 	cloneObj: cloneObj,
 	_debounce:_debounce,
-	downloadFile
+	downloadFile,
+	getOpenId
 }