centaline-data-driven 1.3.6 → 1.3.9

package/build/centaline/centaline.path.js

@@ -45,7 +45,8 @@ const paths = {
     "dynamicContact": "./src/centaline/dynamicContact/index.js",//联系人电话
     "dynamicLayout": "./src/centaline/dynamicLayout/index.js",//Layout组件
     "browseVideo": "./src/centaline/browseVideo/index.js",//确认框组件 
-       "dynamicViewerFile": "./src/centaline/dynamicViewerFile/index.js",//确认框组件
+    "browseIframe": "./src/centaline/browseIframe/index.js",//URL弹层 
+    "dynamicViewerFile": "./src/centaline/dynamicViewerFile/index.js",//图片预览框组件
   },
   "plugs": {
     "api": "./src/centaline/api/index.js",//调用API插件

package/package.json

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

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

@@ -1,6 +1,6 @@
 <template>
   <div style="width:100%;height:100%;">
-    <iframe :src="src" ref="iframe" id="iframe1" name="iframe1" style="width:100%;height:100%;"></iframe>
+    <iframe :src="src" ref="iframe" style="width:100%;height:99%;" frameborder="0" @load="sendMessage()"></iframe>
   </div>
 </template>
 <script>
@@ -11,12 +11,58 @@
     },
     data() {
       return {
-
       };
     },
-    mounted () {      
+    mounted () {
+      window.addEventListener('message', this.handleMessage);
     },
     methods: {
+      sendMessage () {
+        let token= this.getCookie("token");
+        this.$refs.iframe.contentWindow.postMessage({
+          functionName: 'cookie',
+          params:  {
+            success: true,
+            data: token,
+          }
+        }, '*');
+      },
+      handleMessage (event) {
+        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
+          case 'title':
+            self.$parent.vmodel.title=data.params.data;
+            break
+        }
+      },
+      getCookie(c_name){
+        if (document.cookie.length>0){
+          let c_start=document.cookie.indexOf(c_name + "=")
+          if (c_start!=-1){ 
+          c_start=c_start + c_name.length+1 
+          let c_end=document.cookie.indexOf(";",c_start)
+          if (c_end==-1) c_end=document.cookie.length
+            return unescape(document.cookie.substring(c_start,c_end))
+          } 
+        }
+        return ""
+      },
     }
   }
 </script>

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

@@ -15,7 +15,6 @@
     },
     methods: {
       close() {
-        //this.dialogTableVisible = false;
         this.$emit('close', this);
         if (this.vmodel.content[0].on && typeof this.vmodel.content[0].on["closeDialog"] === "function") {
           this.vmodel.content[0].on["closeDialog"]();
@@ -25,7 +24,7 @@
         //ev.cancelBubble = true;
         //ev.stopPropagation();
         //ev.preventDefault();
-      }
+      },
     },
     mounted() {
       //this.$el.parentNode.removeChild(this.$el);
@@ -206,7 +205,7 @@
           ]
         )
       ])
-    }
+    },
   }
 </script>
 <style scoped>

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

@@ -22,7 +22,6 @@
     mounted() {
       this.$common.dialogList = this;
       this.overflow = document.body.style.overflow;
-      window.addEventListener('message', this.handleMessage)    
     },
     computed: {
       zindex: function () {
@@ -61,30 +60,6 @@
           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
-          case 'title':
-            self.$children[0].vmodel.title=data.params.data;
-            break
-        }
-      },
     }
   }
 </script>

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -184,11 +184,13 @@ export default {
       var index = MediaAlbum[0].medias.findIndex(
         (v) => v.mediaID === file.source.mediaID
       );
+      debugger;
       var width = parseInt(window.document.body.clientWidth * 0.8);
+      var height = parseInt(window.document.body.clientHeight * 0.8);
       width = width > 1160 ? 1160 : width;
       var dialogOption = {
         title: this.model.label || "预览媒体",
-        pane: self.$common.getParentPane(self),
+        //pane: self.$common.getParentPane(self),
         content: [
           {
             component: "ct-viewerfile",
@@ -200,9 +202,7 @@ export default {
               // width: self.modelPhotoselect.router.pageWidth + 'px',
               // height: self.modelPhotoselect.router.pageHeight+'px',
               width: width + "px",
-              height:
-                parseInt(window.document.body.clientHeight * 0.8).toString() +
-                "px",
+              height: height + "px",
             },
             on: {
               handlePhoto(photoList) {},

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

@@ -769,6 +769,7 @@
                   title: field.pageTitle,
                   pane: self.$common.getParentPane(self),
                   content: [{
+                    component: 'ct-iframe',
                     attrs: {
                       src: submitData[field.submitListField],
                       width: field.dialogWidth + 'px',
@@ -777,6 +778,7 @@
                     on: {
                       new(id) {
                         field.flagAddRowAfterAction=true;
+                        field.flagFreshCurrentRow=false;
                         var res={responseData:{content:id}};
                         self.updateCurrentRow(field, res);
                         self.$forceUpdate();
@@ -784,6 +786,7 @@
                         self.$common.closeDialog(dialogOption.dialog);
                       },
                       update() {
+                        field.flagAddRowAfterAction=false;
                         field.flagFreshCurrentRow=true;
                         self.updateCurrentRow(field, null);
                         self.$common.closeDialog(dialogOption.dialog);
@@ -801,7 +804,7 @@
                       },
                       closeDialog() {
                         self.$common.closeDialog(dialogOption.dialog);
-                      }
+                      },
                     }
                   }]
                 };

package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -446,9 +446,9 @@ html {
 .magnify-toolbar {
   display: inline-block;
   background-color: rgba(0, 0, 0, 0.5);
-  -webkit-border-radius: 5px 5px 0 0;
-  -moz-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
 }
 .magnify-toolbar .magnify-btn {
   margin: 15px 20px;
@@ -460,7 +460,9 @@ html {
 .magnify-btn-close:hover {
   color: #fff;
 }
-
+.viewerMenu{
+  border-right: solid 2px #e6e6e6 !important;
+}
 .viewerMenu .el-submenu__title,
 .viewerMenu .el-submenu .el-menu-item {
   height: 30px;