@zscreate/zhxy-app-component 1.0.98 → 1.0.100

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

@@ -25,6 +25,7 @@ export const pubSubMixin = {
 				// console.log('订阅');
 				let tableIndex = this.tableIndex; //子表单联动
 				subscribeKey = this.tableKey ? tableIndex + '_' + subscribeKey : subscribeKey;
+				if (["grid", 'grid-lay-out', 'all-lay-out', 'table'].includes(this.widget.type)) return
 				this.pubsubSign = Pubsub.subscribe(subscribeKey, (msg, data) => {
 					console.log('接受消息', data);
 					// console.log(msg, data);

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

@@ -201,6 +201,7 @@ import evanFormItem from "../evan-form-item/evan-form-item";
 import evanForm from "../evan-form/evan-form";
 import mTextarea from "../m-textarea/m-textarea";
 import packageJson from '../../package.json'
+import { run } from "../../utils/js-interp"
 console.log('zhxy-app-component: ', packageJson.version)
 export default {
   options: { styleIsolation: 'shared' },
@@ -311,7 +312,8 @@ export default {
         // 	},
         // }
     },
-    created() {},
+    created() {
+    },
     updated() {
 
     },
@@ -574,6 +576,33 @@ export default {
         generateModle(genList) {
             if (!genList || genList.length === 0) return;
             for (let i = 0; i < genList.length; i++) {
+              if (["grid", 'grid-lay-out', 'all-lay-out', 'table'].includes(genList[i].type)) {
+                let subscribeKey = genList[i].options.subscribeOptions ?
+                    genList[i].options.subscribeOptions.subscribeKey :
+                    '';
+                  this.$store.state.subscribeKeys.push(subscribeKey)
+                  Pubsub.subscribe(subscribeKey, (msg, data) => {
+                    console.log('layout 接受消息', data);
+                    const widget = genList[i]
+                    const list = data.msg
+                    const that = this
+                    that.isWx = true
+                    let global =  globalThis
+                    eval(data.operateValue)
+                    return
+                    // #endif
+
+                    console.log(run(data.operateValue, {
+                      that: this,
+                      widget,
+                      global: globalThis,
+                      list,
+                      isWx: true,
+                      uni
+                    }))
+                  });
+
+              }
                 if (["grid", 'grid-lay-out', 'all-lay-out'].includes(genList[i].type)) {
                     genList[i].columns.forEach(item => {
                         this.generateModle(item.list);
@@ -862,10 +891,10 @@ $mybottom: 0; //底部按钮
 @include onepx('.verify-cot', 'bottom', 'after', #e6e6e6);
 
 .table-header {
-    height: 86upx;
+  min-height: 86upx;
     line-height: 86upx;
+  padding: 0 30upx;
     font-weight: bold;
-    text-indent: 30upx;
     font-size: $uni-form-title-font-size;
 }
 

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

@@ -100,7 +100,6 @@
           })
           return
         }
-        this.uploadIng = true
 				var that = this;
         //#ifdef H5
         uni.chooseFile
@@ -112,6 +111,7 @@
 					count: 1,
 					type: 'all',
 					success: (res) => {
+            this.uploadIng = true
 						console.log(res.tempFiles)
 						const path = res.tempFiles
             const { ext = '' , options } = this.widget
@@ -169,7 +169,7 @@
 					},
 
           complete: (res) => {
-            if (res.errMsg.includes('cancel')) return that.uploadIng = false
+            // if (res.errMsg.includes('cancel')) return that.uploadIng = false
           }
 				});
 			}

package/package.json

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