centaline-data-driven 1.3.3 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.03",
+  "version": "1.3.04",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" @submit="submit"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -26,43 +26,6 @@ pageTitle: "成交报告",
       test111(val) {
         alert(JSON.stringify(val));
       },
-      submit(formData) {
-        window.parent.postMessage({
-            functionName: 'delete',
-            params: {
-              success: true,
-              data: null,
-            }
-        }, '*');
-        window.parent.postMessage({
-            functionName: 'update',
-            params: {
-              success: true,
-              data: null,
-            }
-        }, '*');
-        window.parent.postMessage({
-            functionName: 'refresh',
-            params: {
-              success: true,
-              data: null,
-            }
-        }, '*');
-        window.parent.postMessage({
-            functionName: 'close',
-            params: {
-              success: true,
-              data: null,
-            }
-        }, '*');
-        window.parent.postMessage({
-            functionName: 'new',
-            params: {
-              success: true,
-              data: '453FBDDF-1F56-4A1D-AB9E-F70C3681EB1C',
-            }
-        }, '*');
-      }
     }
   }
 </script>

package/src/centaline/browseIframe/src/browseIframe.vue

@@ -1,32 +1,9 @@
 <template>
   <div style="width:100%;height:100%;">
-    <iframe :src="src" ref="iframe" id="iframe1" style="width:100%;height:100%;"></iframe>
+    <iframe :src="src" ref="iframe" id="iframe1" name="iframe1" style="width:100%;height:100%;"></iframe>
   </div>
 </template>
 <script>
-window.addEventListener('message', handleMessage1)  ;
-function handleMessage1 (event) {
-      debugger
-      var self=this;
-      var data = event.data;
-      switch (data.functionName) {
-        case 'new':
-          self.$emit('new',data.params.data);
-          break
-        case 'update':
-          self.$emit('update');
-          break
-        case 'delete':
-          self.$emit('delete');
-          break
-        case 'refresh':
-          self.$emit('refreshParent');
-          break
-        case 'close':
-          self.$emit('closeDialog');
-          break
-      }
-    }
   export default {
     name: 'ct-iframe',
     props: {
@@ -37,55 +14,9 @@ function handleMessage1 (event) {
 
       };
     },
-    mounted () {
-      window.addEventListener('message', this.handleMessage)    
-    },
-    handleMessage (event) {
-      debugger
-      var self=this;
-      var data = event.data;
-      switch (data.functionName) {
-        case 'new':
-          self.$emit('new',data.params.data);
-          break
-        case 'update':
-          self.$emit('update');
-          break
-        case 'delete':
-          self.$emit('delete');
-          break
-        case 'refresh':
-          self.$emit('refreshParent');
-          break
-        case 'close':
-          self.$emit('closeDialog');
-          break
-      }
+    mounted () {      
     },
     methods: {
-      
-    handleMessage (event) {
-      debugger
-      var self=this;
-      var data = event.data;
-      switch (data.functionName) {
-        case 'new':
-          self.$emit('new',data.params.data);
-          break
-        case 'update':
-          self.$emit('update');
-          break
-        case 'delete':
-          self.$emit('delete');
-          break
-        case 'refresh':
-          self.$emit('refreshParent');
-          break
-        case 'close':
-          self.$emit('closeDialog');
-          break
-      }
-    },
     }
   }
 </script>

package/src/centaline/dialogList/src/dialogList.vue

@@ -22,6 +22,7 @@
     mounted() {
       this.$common.dialogList = this;
       this.overflow = document.body.style.overflow;
+      window.addEventListener('message', this.handleMessage)    
     },
     computed: {
       zindex: function () {
@@ -59,7 +60,28 @@
           document.body.style.overflow = this.overflow;//出现滚动条
           document.removeEventListener("touchmove", mo, false);
         }
-      }
+      },
+      handleMessage (event) {
+        var self=this;
+        var data = event.data;
+        switch (data.functionName) {
+          case 'new':
+            self.$children[0].vmodel.content[0].on.new(data.params.data);
+            break
+          case 'update':
+            self.$children[0].vmodel.content[0].on.update();
+            break
+          case 'delete':
+            self.$children[0].vmodel.content[0].on.delete();
+            break
+          case 'refresh':
+            self.$children[0].vmodel.content[0].on.refreshParent();
+            break
+          case 'close':
+            self.$children[0].vmodel.content[0].on.closeDialog();
+            break
+        }
+      },
     }
   }
 </script>

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -771,15 +771,14 @@
                   content: [{
                     attrs: {
                       apiParam: field.getActionPara(submitData).para,
-                      src: 'http://10.88.22.46/BAgency/Test/TestPropertyAll.aspx',
+                      src: 'http://localhost/BAgency/Test/TestPropertyAll.aspx',
                       width: field.dialogWidth + 'px',
                       height: field.dialogHeight + 'px'
                     },
                     on: {
                       new(id) {
                         field.flagAddRowAfterAction=true;
-                        var res={};
-                        res.content=id;
+                        var res={responseData:{content:id}};
                         self.updateCurrentRow(field, res);
                         self.$forceUpdate();
                         self.$refs.footer.$forceUpdate();
@@ -792,8 +791,8 @@
                       },
                       delete() {
                         var res={};
-                        res.notification=self.model.Enum.ActionType.Delete;
-                        res.content=self.model.listData[self.selectIndex][self.model.primaryKey];
+                        res.notification=4;
+                        res.content=self.model.listData[self.model.selectIndex][self.model.primaryKey];
                         self.model.doAction(res);
                         self.$common.closeDialog(dialogOption.dialog);
                       },

package/src/centaline/loader/src/ctl/Router.js

@@ -201,10 +201,16 @@ const Router = function (source) {
     get flagFreshCurrentRow() {
       return source.flagFreshCurrentRow;
     },
+    set flagFreshCurrentRow(v) {
+      source.flagFreshCurrentRow=v;
+    },
     //路由操作完成后是根据返回ID读取数据新增行
     get flagAddRowAfterAction() {
       return source.flagAddRowAfterAction;
     },
+    set flagAddRowAfterAction(v) {
+      source.flagAddRowAfterAction=v;
+    },
     get textColor() {
       return source.textColor || '';
     },