centaline-data-driven 1.2.99 → 1.3.2

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

@@ -173,9 +173,9 @@ export default {
     },
     viewerfile(file) { 
       var self = this;
-      var MediaAlbum = [{ albumName: "媒体", medias: [] }];
+      var MediaAlbum = [{ albumName: this.model.label||"媒体", medias: [] }];
      
-      let fileList = this.model.sourceList.filter((item) => {
+      let fileList = this.model.sourceList.filter((item) => { 
         return item.flagDeleted !== true;
       });
       fileList.forEach((v) => {
@@ -185,7 +185,7 @@ export default {
         (v) => v.mediaID === file.source.mediaID
       );
       var dialogOption = {
-        title: "预览媒体",
+        title: this.model.label||"预览媒体",
         pane: self.$common.getParentPane(self),
         content: [
           {

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

@@ -9,7 +9,7 @@
 
       <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
       @loaded="screenLoaded" :screenPara="screenPara" 
-      :categoryLoaded="loaded.categoryLoaded" @search="search()" 
+      :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut" 
       @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
       <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" @loaded="tableLoaded"
@@ -274,6 +274,9 @@
         this.rowClickHandle();
         this.$refs.table.refreshFromSimple(field,data);
       },
+      saveShortcut(){
+        this.$refs.table.getPage(1);
+      },
     }
   }
 </script>

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -8,9 +8,9 @@
         </template>
         <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
       </div>
-      <!-- <div class="ct-ptb5" v-if="model.shortcutForm">
+      <div class="shortcutFollow" style="padding-left: 20px;" v-if="model.shortcutForm">
         <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut"></ct-form>
-      </div> -->
+      </div>
       <el-popover class="SeachScreenPop max-seachpopper" placement="top" transition="el-zoom-in-top" v-model="highScreen" trigger="click" visible-arrow="false">
         <div style="width:100%">
           <template v-for="(col, index) in highScreenRow" v-if="col.show !== false">
@@ -166,8 +166,7 @@
         });
       },
       saveShortcut(){
-        var self=this;
-        
+        this.$emit('saveShortcut');
       },
     }
   }

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

@@ -107,6 +107,10 @@
                   </el-popover>
                 </div>
 
+                <ct-tablecurrency v-else-if="column.id==='voice'" :isShowVoice="true" :router="column.router" :colValue="column.router.label" :rowData="row" @click="rolRouterClickHandler"
+                  :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
+                </ct-tablecurrency>
+
                 <!--可点击的列-->
                 <ct-tablecurrency v-else-if="column.router" :align="column.attrs.align" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :router="column.router" :colValue="row[column.id]" :rowData="row"
                                   @click="rolRouterClickHandler">
@@ -760,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

@@ -1,15 +1,30 @@
 <template>
-  <div style="height: 100%" id="viewer-file">
+  <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>
-          <el-menu :default-openeds="openeds" :default-active="activeitem">
+        ><div style="height: 100%" class="viewerMenu">
+          <el-menu
+            :default-openeds="openeds"
+            :default-active="activeitem"
+            style="height: 100%"
+          >
             <el-submenu
               :key="groupIndex"
               :index="groupIndex.toString()"
               v-for="(group, groupIndex) in MediaAlbum"
             >
-              <template slot="title"> <i></i>{{ group.albumName }} </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)"
@@ -23,7 +38,7 @@
           </el-menu>
         </div>
       </el-aside>
-      <el-main>
+      <el-main ref="displayArea">
         <div
           style="position: relative; width: 100%; height: 100%"
           v-if="resultObject"
@@ -84,7 +99,10 @@
           <!--File-->
           <template v-else-if="itemFile.mediaTypeID == '6'">
             <template
-              v-if="'doc,docx,xlsx'.search(FileExtension(itemFile)) > -1"
+              v-if="
+                'doc,docx,xlsx'.search((itemFile.fileExtension).toLowerCase()) >
+                -1
+              "
             >
               <div
                 class="viewerContent"
@@ -97,30 +115,40 @@
                 >
               </div>
             </template>
-            <template v-else-if="'pdf'.search(FileExtension(itemFile)) > -1">
-              <div
-                class="viewerContent"
-                style="height: 100%; width: 800px; text-align: center"
-              >
-                <ct-viewerPDF :pdfUrl="resultObject"> </ct-viewerPDF>
-              </div>
+            <template
+              v-else-if="
+                'pdf'.search(itemFile.fileExtension.toLowerCase()) > -1
+              "
+            >
+              
+                <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">
-              <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'">
@@ -198,6 +226,10 @@ export default {
       groupCountLen: 0,
       activeitem: "",
       openeds: [],
+      displayAreaWidth: 0,
+      displayAreabtm: 0,
+      displayArealeft: 0,
+      displayAreaHeight: 0,
     };
   },
   created() {
@@ -210,7 +242,19 @@ export default {
       });
     });
   },
-  mounted() { 
+
+  mounted() {
+    var self = this;
+    self.displayAreaWidth = this.DomWidth();
+    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.displayArealeft = self.DomLeft();
+      self.displayAreabtm = self.DomTop(self.$refs.displayArea.$el);
+        self.displayAreaHeight =self.$refs.displayArea.$el.offsetHeight;
+    };
 
     if (
       this.groupIndex != undefined &&
@@ -218,15 +262,55 @@ export default {
       this.groupIndex > -1 &&
       this.index > -1
     ) {
-     var  item = this.MediaAlbum[this.groupIndex].medias[this.index];
+      var item = this.MediaAlbum[this.groupIndex].medias[this.index];
       this.handleClick(item, this.groupIndex, this.index);
     }
   },
   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;
+
+      return Width;
+    },
+    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;
+      return curDomBottom;
+    },
     FileExtension(item) {
       return item.savedFileName.replace(/.+\./, "").toLowerCase();
     },
+    offsetLeft(elements) {
+      var left = elements.offsetLeft;
+      var parent = elements.offsetParent;
+      while (parent != null) {
+        left += parent.offsetLeft;
+        parent = parent.offsetParent;
+      }
 
+      return left;
+    },
     handleClick(item, groupIndex, index) {
       if (index == this.activeIndex && groupIndex == this.activeGroup) return;
       this.activeIndex = index;
@@ -245,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;
@@ -318,9 +402,9 @@ export default {
   },
 };
 // 禁止右键菜单
-document.oncontextmenu = function () {
-  return false;
-};
+// document.oncontextmenu = function () {
+//   return false;
+// };
 </script>
 
 <style>
@@ -344,11 +428,10 @@ html {
 }
 
 .magnify-footer {
-  width: calc(100vw - 340px);
   position: fixed;
   height: 50px;
-  bottom: 20px;
-  text-align: center;
+  bottom: 0px;
+  /* text-align: center; */
   color: #fff;
   z-index: 9;
 }
@@ -370,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>
+ 

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

@@ -30,6 +30,11 @@ const Detail = function (source,para ,callBack) {
         _operationList:null,
         _operationRouters:[],
         _commissionList:null,
+        get mediaAlbums() {
+          return data.mediaAlbums||[];
+        },  get noMediaUrl() {
+          return data.noMediaUrl||"";
+        },
         get title() {
           return data.title;
         },

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

@@ -98,6 +98,9 @@ const Router = function (source) {
     get isSearchPageWithList() {
       return source.pageStyle === Enum.PageStyle.SearchPageWithList;
     },
+    get isUrlInLayer(){
+      return source.pageStyle === Enum.PageStyle.UrlInLayer;
+    },
     get isOpenUrlInBrowse() {
       return source.actionType === Enum.ActionType.OpenUrlInBrowse;
     },

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

@@ -6,7 +6,6 @@ import common from '../../../common';
 import Vue from 'vue';
 const SearchScreen = function (source, callBack, screenPara) {
   var init = function (source) {
-    console.log(source.content)
     var rtn = {
       $vue: null,
       get source() {

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -544,7 +544,12 @@ const Enum = {
     /// <summary>
     /// 查询列表选择页（如：客户选择）
     /// </summary>
-    SearchPageWithList: 7
+    SearchPageWithList: 7,
+
+    /// <summary>
+    /// URL页面（弹层）
+    /// </summary>
+    UrlInLayer: 8,
   },
 
   /// <summary>

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -1,12 +1,19 @@
 <template>
-  <div :class="isOperationalColumn?'subdiv_allinline':''" v-if="isShowLabel" @click="isOperationalColumn?clickHandler($event):null">
-    <div v-if="router.isListenVoice">
+  <div :class="isOperationalColumn?'subdiv_allinline':''" v-if="isShowLabel" @click="isOperationalColumn?clickHandler($event):null">    
+    <div v-if="isShowVoice" style="line-height: 16px;padding-top: 3px;">
+      <video ref="video" :src="rowData[router.submitFormField]" controls="true" controlslist="nodownload" 
+        @timeupdate="saveVoiceHistoryHandler" @ended="voiceEndedHandler"
+        height="20" width="100%">您的浏览器不支持 video 标签。
+      </video>
+    </div>
+    <div v-else-if="router.isListenVoice">
       <el-popover  class="Stats-popover" :popper-class="'el-listenVoice'+rowindex" :placement="option.placement?option.placement:'left'" 
         v-model="visible" :trigger="option.trigger?option.trigger:''" style="margin:0px;">
         <div class="alert fade in" role="alert" style="padding:0px;border-bottom:none;display: table-caption;">
           <button type="button" class="close el-icon-close" style="right:0px;float:right;margin-bottom: 5px;cursor: pointer;" data-dismiss="alert" aria-label="Close" @click="clickHandler">            
           </button>
-          <video ref="video" :src="rowData[router.submitFormField]" controls="true" autoplay controlslist="nodownload" @timeupdate="saveVoiceHistoryHandler"
+          <video ref="video" :src="rowData[router.submitFormField]" controls="true" controlslist="nodownload" @timeupdate="saveVoiceHistoryHandler"
+            @ended="voiceEndedHandler"
             :height="router.dialogHeight?router.dialogHeight:'40'" :width="router.dialogWidth?router.dialogWidth:'100%'">您的浏览器不支持 video 标签。
           </video>
         </div>
@@ -40,7 +47,11 @@
       isShowImg: {
         type: Boolean,
         default: true
-      }
+      },
+      isShowVoice:  {
+        type: Boolean,
+        default: false
+      },
     },
     computed: {
       label: function () {
@@ -56,6 +67,7 @@
     data() {
       return {
         visible:false,
+        listenSeconds:-1,
         option: {
           isHidden: true,//是否开启操作栏隐藏设置，默认开启
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
@@ -76,17 +88,25 @@
       },
       saveVoiceHistoryHandler() {
         var self=this;
-        if(self.router.action && self.visible){          
+        if(self.router.action && (self.visible || self.isShowVoice)){
+          var currentTime=parseInt(self.$refs.video.currentTime)+1;
+          if(this.listenSeconds===currentTime){
+            return;
+          }
+          this.listenSeconds=currentTime;
           var submitData = {};
           self.router.actionField.split(',').forEach((k) => {
             submitData[k] = self.rowData[k];
           });
-          submitData.listenSeconds=self.$refs.video.currentTime;
+          submitData.listenSeconds=currentTime;
           self.router.doAction(submitData, (data) => {
            
           })
         }
-      }
+      },
+      voiceEndedHandler() {
+        this.listenSeconds=-1;
+      },
     }
   }
 </script>

package/src/main.js

@@ -47,7 +47,7 @@ Vue.use(centaline, {
     },
     // 请求完成事件，可判断是否登录过期执行响应操作
     requestComplete: function (response) {
-      console.log(response);
+      // console.log(response);
     }
   }});