centaline-data-driven 1.3.4 → 1.3.7

package/package.json

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

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

@@ -80,6 +80,9 @@
           case 'close':
             self.$children[0].vmodel.content[0].on.closeDialog();
             break
+          case 'title':
+            self.$children[0].vmodel.title=data.params.data;
+            break
         }
       },
     }

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

@@ -764,20 +764,20 @@
             else if (field.isSeeVoice) {//看视频              
               self.$common.browseVideo(field,submitData)
             }
-            else if (field.isUrlInLayer) {//URL页面（弹层）       
+            else if (field.isUrlInLayer) {//URL页面（弹层）
               var dialogOption = {
                   title: field.pageTitle,
                   pane: self.$common.getParentPane(self),
                   content: [{
                     attrs: {
-                      apiParam: field.getActionPara(submitData).para,
-                      src: 'http://localhost/BAgency/Test/TestPropertyAll.aspx',
+                      src: submitData[field.submitListField],
                       width: field.dialogWidth + 'px',
                       height: field.dialogHeight + 'px'
                     },
                     on: {
                       new(id) {
                         field.flagAddRowAfterAction=true;
+                        field.flagFreshCurrentRow=false;
                         var res={responseData:{content:id}};
                         self.updateCurrentRow(field, res);
                         self.$forceUpdate();
@@ -785,6 +785,7 @@
                         self.$common.closeDialog(dialogOption.dialog);
                       },
                       update() {
+                        field.flagAddRowAfterAction=false;
                         field.flagFreshCurrentRow=true;
                         self.updateCurrentRow(field, null);
                         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%; height: 100%"
+          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="height: 100px; 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();
     },
@@ -405,10 +412,6 @@ export default {
     },
   },
 };
-// 禁止右键菜单
-// document.oncontextmenu = function () {
-//   return false;
-// };
 </script>
 
 <style>

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

@@ -1,10 +1,11 @@
 
 <template>
-  <div class="Imagebox" @mousewheel="bagimg($event)">
+  <div class="Imagebox" @mousewheel="bagimg($event)" v-loading="loading">
     <img
       id="ViewerImage"
       class="scaleimg"
       border="0"
+      @load="complete()"
       v-bind:style="{
         transform:
           'scale(' +
@@ -25,6 +26,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       params: {
         zoomVal: 1,
         left: 0,
@@ -36,12 +38,21 @@ export default {
     };
   },
   mounted() {
+    this.loading = true;
     this.startDrag(
       document.getElementById("ViewerImage"),
       document.getElementById("ViewerImage")
     );
+  },
+   watch: {
+    imgUrl(newValue, oldValue) {
+      this.loading = true;
+    },
   },
   methods: {
+    complete() {
+      this.loading = false;
+    },
     zoom(n) {
       this.params.zoomVal += n;
     },

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);
     },
   },