centaline-data-driven 1.3.5 → 1.3.8

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.05",
+  "version": "1.3.08",
   "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 deviceID= this.getCookie("DeviceID");
+        this.$refs.iframe.contentWindow.postMessage({
+          functionName: 'cookie',
+          params:  {
+            success: true,
+            data: deviceID || 'XXXXXXXXXXX',
+          }
+        }, '*');
+      },
+      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,27 +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
-        }
-      },
     }
   }
 </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

@@ -1,5 +1,10 @@
 <template>
-  <div style="height: 100%" id="viewer-file" ref="viewerfile" @contextmenu="handleMouse">
+  <div
+    style="height: 100%"
+    id="viewer-file"
+    ref="viewerfile"
+    @contextmenu="handleMouse"
+  >
     <el-container style="height: 100%; border: 1px solid #eee">
       <el-aside style="background-color: rgb(238, 241, 246)"
         ><div style="height: 100%" class="viewerMenu">
@@ -40,18 +45,18 @@
       </el-aside>
       <el-main ref="displayArea">
         <div
-          style="position: relative; width: 100%;" :style="{'height':displayAreaHeight-78+'px'}"
+          style="position: relative; width: 100%"
+          :style="{ height: displayAreaHeight - 78 + 'px' }"
           v-if="resultObject"
         >
           <!--VR-->
           <template v-if="itemFile.mediaTypeID == '1'">
-            <div
-              class="viewerContent"
-              style="height: 100%; width: 800px; text-align: center"
-            >
-              暂不支持VR
-              <!-- <ct-viewerVR :VRUrl="resultObject"> </ct-viewerVR> -->
-            </div>
+              <iframe 
+                :src="resultObject"
+                :height="displayAreaHeight - 80 + 'px'"
+                :width="displayAreaWidth + 'px'"
+              >
+              </iframe>
           </template>
           <!--Photo-->
           <template v-else-if="itemFile.mediaTypeID == '2'">
@@ -100,13 +105,13 @@
           <template v-else-if="itemFile.mediaTypeID == '6'">
             <template
               v-if="
-                'doc,docx,xlsx'.search((itemFile.fileExtension).toLowerCase()) >
+                'doc,docx,xlsx'.search(itemFile.fileExtension.toLowerCase()) >
                 -1
               "
             >
               <div
                 class="viewerContent"
-                style=" max-height: 200px; text-align: center"
+                style="max-height: 200px; text-align: center"
               >
                 <a :href="resultObject">
                   <img :src="itemFile.thumbnailUrl" /><br />{{
@@ -120,9 +125,12 @@
                 'pdf'.search(itemFile.fileExtension.toLowerCase()) > -1
               "
             >
-              
-                <ct-viewerPDF :pdfUrl="resultObject" :displayAreaHeight="displayAreaHeight" :displayAreaWidth="displayAreaWidth"> </ct-viewerPDF>
-            
+              <ct-viewerPDF
+                :pdfUrl="resultObject"
+                :displayAreaHeight="displayAreaHeight"
+                :displayAreaWidth="displayAreaWidth"
+              >
+              </ct-viewerPDF>
             </template>
           </template>
           <template v-else> 不支持此类型：{{ itemFile.mediaTypeID }} </template>
@@ -248,12 +256,12 @@ export default {
     self.displayAreaWidth = this.DomWidth();
     self.displayArealeft = self.DomLeft();
     self.displayAreabtm = self.DomTop(self.$refs.displayArea.$el);
-    self.displayAreaHeight =self.$refs.displayArea.$el.offsetHeight;
+    self.displayAreaHeight = self.$refs.displayArea.$el.offsetHeight;
     window.onresize = () => {
       self.displayAreaWidth = self.DomWidth();
       self.displayArealeft = self.DomLeft();
       self.displayAreabtm = self.DomTop(self.$refs.displayArea.$el);
-        self.displayAreaHeight =self.$refs.displayArea.$el.offsetHeight;
+      self.displayAreaHeight = self.$refs.displayArea.$el.offsetHeight;
     };
 
     if (
@@ -267,7 +275,6 @@ export default {
     }
   },
   methods: {
-    
     handleMouse(e) {
       e.preventDefault();
     },
@@ -404,7 +411,7 @@ export default {
       this.$refs.viewerImage.zoom(n);
     },
   },
-}; 
+};
 </script>
 
 <style>

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

@@ -1,8 +1,7 @@
 
 <template>
-  <div class="Imagebox" @mousewheel="bagimg($event)">
+  <div class="Imagebox" @mousewheel="bagimg($event)" v-loading="loading">
     <img
-      v-loading="loading"
       id="ViewerImage"
       class="scaleimg"
       border="0"
@@ -44,6 +43,11 @@ export default {
       document.getElementById("ViewerImage"),
       document.getElementById("ViewerImage")
     );
+  },
+   watch: {
+    imgUrl(newValue, oldValue) {
+      this.loading = true;
+    },
   },
   methods: {
     complete() {

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

@@ -1,13 +1,13 @@
 
 <template>
-  <div>
-    <iframe
+  <div v-loading="loading">
+    <iframe 
       ref="previewPdf"
       id="previewPdf"
       :src="'/static/pdf/web/viewer.html?' + fileUrl"
       :height="displayAreaHeight - 78 + 'px'"
       :width="displayAreaWidth + 'px'"
-      @load="loadFrame()"
+      @load="complete()"
     >
     </iframe>
   </div>
@@ -21,6 +21,7 @@ export default {
   },
   data() {
     return {
+       loading: true,
       numPages: 1,
       fileUrl: "",
     };
@@ -28,19 +29,15 @@ export default {
   mounted() {
     this.init(this.pdfUrl);
   },
-  created() {
-    this.$nextTick(() => {
-      // 可以使用回调函数的写法
-      // 这个函数中DOM必定渲染完成
-      //this.loadFrame();
-    });
+  created() { 
   },
-  methods: {
+  methods: { 
     init(pdfUrl) {
       var self = this;
       self.fileUrl = 'r='+Math.random()+'&file='+encodeURIComponent(pdfUrl);
     },
-    loadFrame() {
+    complete() {
+       this.loading = false;
       var doc = document.getElementById("previewPdf").contentWindow.document;
       doc.getElementById("download").style.display = "none";
       doc.getElementById("openFile").style.display = "none";
@@ -50,6 +47,7 @@ export default {
   },
   watch: {
     pdfUrl(newValue, oldValue) {
+       this.loading = true;
       this.init(newValue);
     },
   },