centaline-data-driven 1.3.1 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.01",
+  "version": "1.3.02",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,
@@ -21,7 +21,6 @@
     "save": "^2.4.0",
     "v-viewer": "^1.6.4",
     "vue": "2.5.17",
-    "vue-pdf": "^4.3.0",
     "vue-ueditor-wrap": "^2.5.6",
     "vuedraggable": "^2.24.3"
   },

package/src/SearchList.vue

@@ -4,14 +4,15 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'" 
-    :searchDataApi="'/SystemParameterList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
+    :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
+    :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist>
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
                    :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
                     :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist>
+                   ></ct-searchlist> -->
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/browseIframe/index.js

@@ -0,0 +1,11 @@
+import browseIframe from './src/browseIframe'
+
+browseIframe.install = function (Vue) {
+  Vue.component(browseIframe.name, browseIframe);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(browseIframe);
+}
+
+export default browseIframe;

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

@@ -0,0 +1,48 @@
+<template>
+  <div style="width:100%;height:100%;">
+    <iframe :src="src" ref="iframe" style="width:100%;height:100%;"></iframe>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'ct-iframe',
+    props: {
+      src:String,
+    },
+    data() {
+      return {
+
+      };
+    },
+    mounted () {
+      window.addEventListener('message', this.handleMessage)    
+    },
+    handleMessage (event) {
+      var self=this;
+      var data = event.data;
+      switch (data.functionName) {
+        case 'new':
+          self.$emit('new',data.params);
+          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
+      }
+    },
+    methods: {
+      
+    }
+  }
+</script>
+<style scoped>
+
+</style>

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

@@ -75,8 +75,10 @@
                   //'class': [
                   //  'dialog-content '
                   //]
-                }, [
-                    h('table', {
+                }, 
+                [
+                    h('table', 
+                    {
                       attrs: {
                         border: '0',
                         cellspacing: '0',
@@ -92,7 +94,8 @@
                           this.bodyClickHandler(event);
                         } 
                       }
-                    }, [
+                    }, 
+                    [
                         h('tbody', {}, [
                           h('tr', {}, [
                             h('td', {
@@ -152,8 +155,7 @@
                                     if(self.vmodel.pane && self.vmodel.pane.$el.clientHeight<ph){
                                       item.attrs.height=(self.vmodel.pane.$el.clientHeight-40)+'px';
                                     }
-                                    // console.log(document.body.clientHeight);可见区域高度
-                                    // console.log(item.attrs.height)
+                                    
                                     return h('div', {
                                       style: {
                                         width: item.attrs.width,
@@ -167,7 +169,13 @@
                                         }, [])
                                       ]);
                                   }
-                                  else {
+                                  else {var ph=0;
+                                    if(item.attrs.height){
+                                      ph=parseInt(item.attrs.height.replace('px',''));
+                                    }
+                                    if(self.vmodel.pane && self.vmodel.pane.$el.clientHeight<ph){
+                                      item.attrs.height=(self.vmodel.pane.$el.clientHeight-50)+'px';
+                                    }
                                     return h('div', {
                                       style: {
                                       }
@@ -176,11 +184,11 @@
                                           attrs: {
                                             name: 'name',
                                             id: 'id',
-                                            src: 'http://10.88.22.35:3333/#/form',
+                                            src: item.attrs.src,
                                             frameborder: '0',
                                             align: "left",
-                                            width: '100%',
-                                            height: '100%',
+                                            width: item.attrs.width,
+                                            height: item.attrs.height,
                                             scrolling: "yes"
                                           }
                                         })

package/src/centaline/dynamicDetail/src/dynamicAlbums.vue

@@ -2,44 +2,46 @@
 <template>
   <div>
     <div style="position: relative">
-      <el-carousel
-        arrow="hover"
-        height="199px"
-        :autoplay="false"
-        indicator-position="none"
-        :initial-index="getinitialIndex(albumsList)"
-      >
-        <template v-for="(item, index) in albumsList.medias">
-          <el-carousel-item :key="index">
-            <div class="swiper-i">
-              <img
-                :src="item.mediaUrl + '/260/200'"
-                @click="viewerfile(index)"
-              />
-              <img
-                :src="item.albumBigImageUrl"
-                alt=""
-                class="hous-icon"
-                v-if="item.albumBigImageUrl && item.albumBigImageUrl != ''"
-              />
-            </div> </el-carousel-item
-        ></template>
-      </el-carousel>
+      <template v-if="newMediaAlbums.length > 0">
+        <el-carousel
+          arrow="hover"
+          height="199px"
+          :autoplay="false"
+          indicator-position="none"
+          :initial-index="getinitialIndex(albumsList)"
+        >
+          <template v-for="(item, index) in albumsList.medias">
+            <el-carousel-item :key="index">
+              <div class="swiper-i">
+                <img :src="getShowUrl(item)" @click="viewerfile(index)" />
+                <img
+                  :src="item.albumBigImageUrl"
+                  alt=""
+                  class="hous-icon"
+                  v-if="item.albumBigImageUrl && item.albumBigImageUrl != ''"
+                />
+              </div> </el-carousel-item
+          ></template>
+        </el-carousel>
 
-      <div class="hous-img" style="position: absolute; bottom: 0; z-index: 9">
-        <div class="img-i" v-for="(item, index) in newMediaAlbums" :key="index">
-          <img
-            :src="getDefaultUrl(item) + '/140/135'"
-            @click="handleClick(index)"
-          />
-          <div class="img-bot">
-            <div>
-              <img :src="item.albumSmallImageUrl" alt="" class="img-icon" />
-              <span>{{ item.albumName }}</span>
+        <div class="hous-img" style="position: absolute; bottom: 0; z-index: 9">
+          <div
+            class="img-i"
+            v-for="(item, index) in newMediaAlbums"
+            :key="index"
+          >
+            <img :src="getDefaultUrl(item)" @click="handleClick(index)" />
+            <div class="img-bot">
+              <div>
+                <img :src="item.albumSmallImageUrl" alt="" class="img-icon" />
+                <span>{{ item.albumName }}</span>
+              </div>
             </div>
           </div>
-        </div>
-      </div>
+        </div> </template
+      ><template v-else>
+        <img :src="noMediaUrl" width="260px" height="199px" />
+      </template>
     </div>
   </div>
 </template>
@@ -48,12 +50,14 @@ export default {
   props: {
     mediaAlbums: Array,
     title: String,
+    noMediaUrl: String,
   },
   data() {
     return {
       newMediaAlbums: [],
       albumsList: [],
       activeAlbumsIndex: 0,
+      flagChange: true,
     };
   },
   created() {
@@ -70,6 +74,8 @@ export default {
       if (index == this.activeAlbumsIndex) return;
       this.albumsList = this.newMediaAlbums[index];
       this.activeAlbumsIndex = index;
+      this.flagChange = !this.flagChange;
+      this.$forceUpdate();
     },
     getinitialIndex(list) {
       var initialIndex = 0;
@@ -82,11 +88,21 @@ export default {
     },
     getDefaultUrl(list) {
       var initialIndex = this.getinitialIndex(list);
-      return list.medias[initialIndex].mediaUrl;
+      return this.getShowUrl(list.medias[initialIndex]);
+    },
+
+    getShowUrl(list) {
+      if (list.mediaTypeID == "2") {
+        return list.mediaUrl + "/260/200";
+      } else {
+        return list.thumbnailUrl;
+      }
     },
     viewerfile(index) {
       var self = this;
 
+      var width = parseInt(window.document.body.clientWidth * 0.8);
+      width = width > 1160 ? 1160 : width;
       var dialogOption = {
         title: this.title || "预览媒体",
         pane: self.$common.getParentPane(self),
@@ -100,9 +116,7 @@ export default {
               index: index || 0,
               // width: self.modelPhotoselect.router.pageWidth + 'px',
               // height: self.modelPhotoselect.router.pageHeight+'px',
-              width:
-                parseInt(window.document.body.clientWidth * 0.8).toString() +
-                "px",
+              width: width + "px",
               height:
                 parseInt(window.document.body.clientHeight * 0.8).toString() +
                 "px",

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -51,7 +51,7 @@
             <div class="hous-info base-box">
               <div class="info-conten">
                 <div class="hous-t">
-                   <ct-albums :mediaAlbums="model.mediaAlbums" :title="model.title"> </ct-albums>
+                   <ct-albums :mediaAlbums="model.mediaAlbums" :title="model.title" :noMediaUrl="model.noMediaUrl"> </ct-albums>
                 </div>
                 <div class="hous-b">
                   <img src="../../../assets/ewm.png" alt="" class="code-ewm">

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -203,7 +203,7 @@
             <div class="info-conten">
               <div class="hous-t">
                 <ct-albums
-                  :mediaAlbums="model.mediaAlbums"
+                  :mediaAlbums="model.mediaAlbums" :noMediaUrl="model.noMediaUrl"
                   :title="model.title"
                 >
                 </ct-albums>

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

@@ -764,6 +764,51 @@
             else if (field.isSeeVoice) {//看视频              
               self.$common.browseVideo(field,submitData)
             }
+            else if (field.isUrlInLayer) {//URL页面（弹层）       
+              var dialogOption = {
+                  title: field.pageTitle,
+                  pane: self.$common.getParentPane(self),
+                  content: [{
+                    attrs: {
+                      apiParam: field.getActionPara(submitData).para,
+                      src: 'http://10.88.22.50:3333/#/form',
+                      width: field.dialogWidth + 'px',
+                      height: field.dialogHeight + 'px'
+                    },
+                    on: {
+                      submit(ev) {
+                        if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
+                          self.model.doAction(ev);
+                        }
+                        self.$forceUpdate();
+                        self.$refs.footer.$forceUpdate();
+                        self.$common.closeDialog(dialogOption.dialog);
+                        self.updateCurrentRow(field, ev);
+                      },
+                      new(ev) {
+
+                      },
+                      update() {
+
+                      },
+                      delete() {
+                        var res={};
+                        res.notification=self.model.Enum.ActionType.Delete;
+                        res.content='';
+                        self.model.doAction(res);
+                      },
+                      refreshParent() {
+                        self.getPage(1);
+                        self.$common.closeDialog(dialogOption.dialog);
+                      },
+                      closeDialog() {
+                        self.$common.closeDialog(dialogOption.dialog);
+                      }
+                    }
+                  }]
+                };
+                self.$common.openDialog(dialogOption);
+            }
             else {
               //self.operationLoading = true;
 

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

@@ -2,7 +2,7 @@
   <div style="height: 100%" id="viewer-file" ref="viewerfile">
     <el-container style="height: 100%; border: 1px solid #eee">
       <el-aside style="background-color: rgb(238, 241, 246)"
-        ><div style="height: 100%">
+        ><div style="height: 100%" class="viewerMenu">
           <el-menu
             :default-openeds="openeds"
             :default-active="activeitem"
@@ -13,7 +13,18 @@
               :index="groupIndex.toString()"
               v-for="(group, groupIndex) in MediaAlbum"
             >
-              <template slot="title"> <i></i><div style="padding: 0 10px !important">{{ group.albumName }}</div> </template>
+              <template slot="title">
+                <i></i>
+                <div
+                  style="
+                    padding: 0 10px !important;
+                    height: 30px;
+                    line-height: 30px;
+                  "
+                >
+                  {{ group.albumName }}
+                </div>
+              </template>
               <el-menu-item-group>
                 <el-menu-item
                   @click="handleClick(item, groupIndex, index)"
@@ -89,7 +100,7 @@
           <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
               "
             >
@@ -109,29 +120,35 @@
                 'pdf'.search(itemFile.fileExtension.toLowerCase()) > -1
               "
             >
-              <div
-                class="viewerContent"
-                style="height: 100%; width: 800px; text-align: center"
-              >
-                <ct-viewerPDF :pdfUrl="resultObject"> </ct-viewerPDF>
-              </div>
+              
+                <ct-viewerPDF :pdfUrl="resultObject" :displayAreaHeight="displayAreaHeight" :displayAreaWidth="displayAreaWidth"> </ct-viewerPDF>
+            
             </template>
           </template>
           <template v-else> 不支持此类型：{{ itemFile.mediaTypeID }} </template>
 
           <template v-if="resultObject != ''">
-            <div class="magnify-footer" :style="{width:displayAreaWidth+'px','bottom':(displayAreabtm+10)+'px'}">
-              <div class="magnify-toolbar">
+            <div
+              class="magnify-footer"
+              :style="{
+                width: displayAreaWidth + 'px',
+                bottom: displayAreabtm + 10 + 'px',
+              }"
+            >
+              <div
+                class="magnify-toolbar"
+                :style="{ 'margin-left': displayArealeft + 'px' }"
+              >
                 <a
                   href="javascript:void(0)"
                   class="magnify-btn el-icon-back"
-                  title="上一张"
+                  title="上一个"
                   @click="jump(-1)"
                 ></a
                 ><a
                   href="javascript:void(0)"
                   class="magnify-btn el-icon-right"
-                  title="下一张"
+                  title="下一个"
                   @click="jump(1)"
                 ></a>
                 <template v-if="itemFile.mediaTypeID == '2'">
@@ -211,6 +228,8 @@ export default {
       openeds: [],
       displayAreaWidth: 0,
       displayAreabtm: 0,
+      displayArealeft: 0,
+      displayAreaHeight: 0,
     };
   },
   created() {
@@ -227,10 +246,14 @@ export default {
   mounted() {
     var self = this;
     self.displayAreaWidth = this.DomWidth();
-    self.displayAreabtm =self.leftDomTop( self.$refs.displayArea.$el);
+    self.displayArealeft = self.DomLeft();
+    self.displayAreabtm = self.DomTop(self.$refs.displayArea.$el);
+    self.displayAreaHeight =self.$refs.displayArea.$el.offsetHeight;
     window.onresize = () => {
-        self.displayAreaWidth = self.DomWidth();
-      self.displayAreabtm =self.leftDomTop( self.$refs.displayArea.$el);
+      self.displayAreaWidth = self.DomWidth();
+      self.displayArealeft = self.DomLeft();
+      self.displayAreabtm = self.DomTop(self.$refs.displayArea.$el);
+        self.displayAreaHeight =self.$refs.displayArea.$el.offsetHeight;
     };
 
     if (
@@ -244,20 +267,35 @@ export default {
     }
   },
   methods: {
-  DomWidth(){ 
-      let arrLength = (window.innerWidth-this.$refs.viewerfile.offsetWidth);
-      arrLength=arrLength>0?arrLength:0;
-     var Width= window.innerWidth-arrLength-this.$refs.displayArea.$el.offsetLeft-40;
-     
+    DomWidth() {
+      let arrLength = window.innerWidth - this.$refs.viewerfile.offsetWidth;
+      arrLength = arrLength > 0 ? arrLength : 0;
+      var Width =
+        window.innerWidth -
+        arrLength -
+        this.$refs.displayArea.$el.offsetLeft -
+        40;
+
       return Width;
     },
-    leftDomTop() {
+    DomLeft() {
+      let arrLength = window.innerWidth - this.$refs.viewerfile.offsetWidth;
+      arrLength = arrLength > 0 ? arrLength : 0;
+      var Width =
+        window.innerWidth -
+        arrLength -
+        this.$refs.displayArea.$el.offsetLeft -
+        40;
+
+      return Width / 2 - 524 + this.$refs.displayArea.$el.offsetLeft - 40;
+    },
+    DomTop() {
       const height = window.innerHeight; //可视区窗口高度
       const curDomHeight = this.$refs.viewerfile.offsetHeight;
       // const curDomHeight = dom.getBoundingClientRect().height
       const curDomY = this.$refs.viewerfile.getBoundingClientRect().y;
       let curDomBottom = height - curDomHeight - curDomY;
-      curDomBottom=curDomBottom>0?curDomBottom:0;
+      curDomBottom = curDomBottom > 0 ? curDomBottom : 0;
       return curDomBottom;
     },
     FileExtension(item) {
@@ -291,7 +329,7 @@ export default {
       var index = -1;
       if (n > 0) {
         if (
-          this.activeGroup * 1 + this.activeIndex + 1 + n >=
+          this.activeGroup * 1 + this.activeIndex + 1 + n >
           this.groupCountLen
         ) {
           groupIndex = 0;
@@ -364,9 +402,9 @@ export default {
   },
 };
 // 禁止右键菜单
-document.oncontextmenu = function () {
-  return false;
-};
+// document.oncontextmenu = function () {
+//   return false;
+// };
 </script>
 
 <style>
@@ -393,7 +431,7 @@ html {
   position: fixed;
   height: 50px;
   bottom: 0px;
-  text-align: center;
+  /* text-align: center; */
   color: #fff;
   z-index: 9;
 }
@@ -415,4 +453,18 @@ html {
 .magnify-btn-close:hover {
   color: #fff;
 }
+
+.viewerMenu .el-submenu__title,
+.viewerMenu .el-submenu .el-menu-item {
+  height: 30px;
+  line-height: 30px;
+}
+.viewerMenu .el-menu-item-group__title {
+  line-height: 1px;
+  height: 1px;
+  display: none;
+}
+.viewerMenu .el-submenu__title .el-submenu__icon-arrow {
+  display: inline-block;
+}
 </style>

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

@@ -1,24 +1,23 @@
 
 <template>
   <div>
-    <pdf
-      v-for="i in numPages"
-      :key="i"
-      :src="fileUrl"
-      :page="i"
-      style="width: 100%"
+    <iframe
+      ref="previewPdf"
+      id="previewPdf"
+      :src="'/static/pdf/web/viewer.html?' + fileUrl"
+      :height="displayAreaHeight - 35 + 'px'"
+      :width="displayAreaWidth + 'px'"
+      @load="loadFrame()"
     >
-    </pdf>
+    </iframe>
   </div>
 </template>
 <script>
-import pdf from "vue-pdf";
 export default {
-  components: {
-    pdf,
-  },
   props: {
     pdfUrl: String,
+    displayAreaHeight: Number,
+    displayAreaWidth: Number,
   },
   data() {
     return {
@@ -29,18 +28,23 @@ export default {
   mounted() {
     this.init(this.pdfUrl);
   },
+  created() {
+    this.$nextTick(() => {
+      // 可以使用回调函数的写法
+      // 这个函数中DOM必定渲染完成
+      //this.loadFrame();
+    });
+  },
   methods: {
     init(pdfUrl) {
       var self = this;
-      var loadingTask = pdf.createLoadingTask(pdfUrl);
-      loadingTask
-        .then((pdf) => {
-          self.fileUrl = loadingTask;
-          self.numPages = pdf.numPages;
-        })
-        .catch((err) => {
-          console.error("pdf加载失败");
-        });
+      self.fileUrl = 'r='+Math.random()+'&file='+encodeURIComponent(pdfUrl);
+    },
+    loadFrame() {
+      var doc = document.getElementById("previewPdf").contentWindow.document;
+      doc.getElementById("download").style.display = "none";
+      doc.getElementById("openFile").style.display = "none";
+      doc.getElementById("print").style.display = "none";
     },
   },
   watch: {
@@ -50,24 +54,4 @@ export default {
   },
 };
 </script>
-
-<style>
-.Imagebox {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-
-.scaleimg {
-  max-height: 100%;
-  max-width: 100%;
-  cursor: move;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  margin: auto;
-}
-</style>
+