centaline-data-driven 1.2.99 → 1.3.0

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/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -1,15 +1,19 @@
 <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%">
+          <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">{{ group.albumName }}</div> </template>
               <el-menu-item-group>
                 <el-menu-item
                   @click="handleClick(item, groupIndex, index)"
@@ -23,7 +27,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 +88,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,7 +104,11 @@
                 >
               </div>
             </template>
-            <template v-else-if="'pdf'.search(FileExtension(itemFile)) > -1">
+            <template
+              v-else-if="
+                'pdf'.search(itemFile.fileExtension.toLowerCase()) > -1
+              "
+            >
               <div
                 class="viewerContent"
                 style="height: 100%; width: 800px; text-align: center"
@@ -109,7 +120,7 @@
           <template v-else> 不支持此类型：{{ itemFile.mediaTypeID }} </template>
 
           <template v-if="resultObject != ''">
-            <div class="magnify-footer">
+            <div class="magnify-footer" :style="{width:displayAreaWidth+'px','bottom':(displayAreabtm+10)+'px'}">
               <div class="magnify-toolbar">
                 <a
                   href="javascript:void(0)"
@@ -198,6 +209,8 @@ export default {
       groupCountLen: 0,
       activeitem: "",
       openeds: [],
+      displayAreaWidth: 0,
+      displayAreabtm: 0,
     };
   },
   created() {
@@ -210,7 +223,15 @@ export default {
       });
     });
   },
-  mounted() { 
+
+  mounted() {
+    var self = this;
+    self.displayAreaWidth = this.DomWidth();
+    self.displayAreabtm =self.leftDomTop( self.$refs.displayArea.$el);
+    window.onresize = () => {
+        self.displayAreaWidth = self.DomWidth();
+      self.displayAreabtm =self.leftDomTop( self.$refs.displayArea.$el);
+    };
 
     if (
       this.groupIndex != undefined &&
@@ -218,15 +239,40 @@ 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;
+    },
+    leftDomTop() {
+      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;
@@ -344,10 +390,9 @@ html {
 }
 
 .magnify-footer {
-  width: calc(100vw - 340px);
   position: fixed;
   height: 50px;
-  bottom: 20px;
+  bottom: 0px;
   text-align: center;
   color: #fff;
   z-index: 9;

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

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