centaline-data-driven 1.4.96 → 1.4.98

package/package.json

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

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/integratedmanage/PreReportData/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/tran-comm-adjust/create'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -11,9 +11,21 @@
     name: 'DataDrivenForm',
     data() {
       return {
-        apiParam:{
-           actionType: 3,
-        jsonData: { preReportDataID: "4789be76-19df-44a5-a256-0f907060bcd9" },
+        apiParam:{actionType
+: 
+"2",
+commAdjustCategory
+: 
+"CC01020020",
+originalTraId
+: 
+"1650403741662187522",
+pageOnly
+: 
+"true",
+pageStyle
+: 
+"2"
         },
         topHeight:10,
       }

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

@@ -776,25 +776,11 @@ export default {
     },
     resetScroll: function () {
       var self = this;
-      if (
-        self.$refs.tableParent.scrollTop >
-        self.$refs["rows." + self.model.selectIndex][0].offsetTop -
-        self.$refs.tableHead.offsetHeight
-      ) {
-        self.$refs.tableParent.scrollTop =
-          self.$refs["rows." + self.model.selectIndex][0].offsetTop -
-          self.$refs.tableHead.offsetHeight;
+      if (self.$refs.tableParent.scrollTop > self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableHead.offsetHeight) {
+        self.$refs.tableParent.scrollTop = self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableHead.offsetHeight;
       }
-      if (
-        self.$refs.tableParent.scrollTop +
-        self.$refs.tableParent.clientHeight <=
-        self.$refs["rows." + self.model.selectIndex][0].offsetTop +
-        self.$refs["rows." + self.model.selectIndex][0].offsetHeight
-      ) {
-        self.$refs.tableParent.scrollTop =
-          self.$refs["rows." + self.model.selectIndex][0].offsetTop -
-          self.$refs.tableParent.clientHeight +
-          self.$refs["rows." + self.model.selectIndex][0].offsetHeight;
+      if (self.$refs.tableParent.scrollTop + self.$refs.tableParent.clientHeight <= self.$refs["rows." + self.model.selectIndex][0].offsetTop + self.$refs["rows." + self.model.selectIndex][0].offsetHeight) {
+        self.$refs.tableParent.scrollTop = self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableParent.clientHeight + self.$refs["rows." + self.model.selectIndex][0].offsetHeight;
       }
       self.scrollTop = self.$refs.tableParent.scrollTop;
     },
@@ -802,14 +788,15 @@ export default {
       var self = this;
       if (action === 1) {
         this.model.downKey();
-      } else {
+      } 
+      else {
         this.model.upKey();
       }
       this.rowColorChange();
       this.resetScroll();
       this.$emit("rowClickHandle");
       if (!this.isBusy) {
-        if (this.model.selectIndex === this.model.listData.length - 1) {
+        if (this.model.selectIndex === this.model.listData.length - 3) {
           self.isBusy = true;
           self.tableLoading = true;
           self.model.nextPage((rtn) => {

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListTab.vue

@@ -21,7 +21,7 @@
       </div>
       <div v-if="categorySource" class="el-tabs__content">
         <div v-for="(col, index) in categorySource.selectItems1" v-show="activeIndex===index" v-loading="isLoading" :key="index" :index="index" class="el-tab-pane" role="tabpanel" aria-hidden="true">
-          <ct-searchlistOne :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight"
+          <ct-searchlistOne v-if="col.loaded" :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight"
             :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="apiParam" @tableLoaded="tableLoaded">
           </ct-searchlistOne>
         </div>
@@ -116,7 +116,7 @@
           function (response) {
             if (response.rtnCode === 200) {
               self.categorySource=response.content.fields[0];
-              console.log('categorySource',self.categorySource)
+              self.categorySource.selectItems1[0].loaded=true;
               let parm={};
               parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
               self.label=self.categorySource.selectItems1[self.activeIndex].displayName;
@@ -131,17 +131,17 @@
         );
       },
       categorychangeHandler() {
-        console.log('activeIndex',this.activeIndex)
         let i = this.activeIndex;
         let parm={};
         parm[this.categorySource.fieldName1]=this.categorySource.selectItems1[i].code;
-        this.label=this.categorySource.selectItems1[i].displayName;
-        this.$nextTick(function () {
-          if(!this.$refs['searchlist'+i][0].loaded.categoryTabLoaded){
+        this.label=this.categorySource.selectItems1[i].displayName;        
+        if(!this.categorySource.selectItems1[i].loaded){
+          this.categorySource.selectItems1[i].loaded=true;
+          this.$nextTick(function () {
             this.isLoading=true;
             this.$refs['searchlist'+i][0].categoryLoaded(parm);
-          }
-        });
+          });
+        };
       },
       categoryLoaded(param) {
         this.listHeight=(this.$refs.main.offsetHeight-42)+'px';
@@ -150,8 +150,9 @@
       categoryLoadedError() {
         this.$refs['searchlist'+this.activeIndex][0].categoryLoadedError();
       },
-      tableLoaded(){
+      tableLoaded(model){
         this.isLoading=false;
+        this.$emit('tableLoaded', model);
       },
       refreshParentHandler() {
         this.$emit('refreshParent');
@@ -161,24 +162,6 @@
           this.$refs['searchlist'+this.activeIndex][0].resize();
         }
       },
-      showTitleHandler() {
-        if (this.$refs['table'+this.activeIndex][0].model && this.$refs['table'+this.activeIndex][0].model.flagShowTitle) {
-          this.title=this.$refs['table'+this.activeIndex][0].model.title;
-          this.showTitle=this.$refs['table'+this.activeIndex][0].model.flagShowTitle;
-        }
-      },
-      showTitleScreenHandler() {
-        if (this.$refs['screen'+this.activeIndex][0].model && this.$refs['screen'+this.activeIndex][0].model.flagShowTitle) {
-          this.title=this.$refs['screen'+this.activeIndex][0].model.title;
-          this.showTitle=this.$refs['screen'+this.activeIndex][0].model.flagShowTitle;
-        }
-      },
-      clickNextHandler() {
-        this.$refs['table'+this.activeIndex][0].rowKeyDownHandle(null,1);
-      },
-      clickPrevHandler() {
-        this.$refs['table'+this.activeIndex][0].rowKeyDownHandle(null,-1);
-      },
     },
     beforeDestroy() {
       async function destroyDeep(vnode) {

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

@@ -56,7 +56,8 @@
           <!--Video-->
           <template v-else-if="itemFile.mediaTypeID == '4'">
             <div class="viewerContent">
-              <video preload="none"
+              <template v-if="itemFile.thumbnailUrl"> 
+               <video preload="none"  :poster="itemFile.thumbnailUrl"
                      :src="resultObject"
                      controls="controls"
                      class="viewerContent"
@@ -65,6 +66,18 @@
                      :width="800">
                 您的浏览器不支持 video 标签。
               </video>
+              </template>
+              <template v-else>
+              <video preload="none" 
+                     :src="resultObject"
+                     controls="controls"
+                     class="viewerContent"
+                     controlslist="nodownload"
+                     :height="500"
+                     :width="800">
+                您的浏览器不支持 video 标签。
+              </video>
+              </template>
             </div>
           </template>
           <!--Audio-->

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

@@ -491,7 +491,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       },
       apiData(callback) {
         var self = this;
-        self.$vue.searchStrat=Date.now();
+        if(self.$vue && self.$vue.searchStrat && self.$vue.searchEnd){
+          self.$vue.searchStrat=Date.now();
+        }
         this.isLoading = true;
         if (self.searchModel) {
           //不需要禁用查询按钮
@@ -509,7 +511,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
           })
           .then(function (response) {
-            self.$vue.searchEnd=Date.now();
+            if(self.$vue && self.$vue.searchStrat && self.$vue.searchEnd){
+              self.$vue.searchEnd=Date.now();
+            }
             self.isLoading = false;
             if (response.rtnCode === Enum.ReturnCode.Successful) {
               if (response.content.rows.length > 0) {
@@ -525,14 +529,12 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               if (typeof response.content.foot !== 'undefined') {
                 self.footer = response.content.foot;
               }
-
               if (typeof response.content.topText !== 'undefined') {
                 self.listHeader = response.content.topText;
               }
               if (typeof response.content.bottomText !== 'undefined') {
                 self.listFooter = response.content.bottomText;
               }
-
               if (typeof response.page.flagMoreData !== 'undefined') {
                 self.flagMoreData = response.page.flagMoreData;
               }
@@ -562,6 +564,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                   self.$vue.setTableHeight();
                 }
               }
+              
               if (typeof callback !== 'undefined') {
                 if (response.content.rows.length > 0) {
                   callback(true,response);

package/src/main.js

@@ -49,8 +49,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '0bbcf3e8-cf7e-42de-adef-af54e2158fe4',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOivZ2fXamy7xp-EQURJShAqRRAIh7o4R0NEzxRRPI725q3UfVaOQnbSJDQRLHoiNBaGcIWhmwawRY-zlE_hR3_TkgrRtckC6Y6BsE0gdMqDYLlJqXUysKjVfz6ox7GvUxciVWobtDWoj-gX2db4c5ts_zp22pWjJyIQDGhgJy5iMBz9pB3z02pGjchXV4wkAAP__.UJfbXztMu3Mir8CBo48y20zouMa8jMar9OMNWQtQBbA',
+        oldToken: '9dac5622-e8b2-46c4-aa90-b5bfd0d1b1e8',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOitt7PXamy7xp-EQUUKMBBUiiQRC3J0goKNnildMM--u5nVUjTLspE1cQ7Dkgbi2IJQzBGQWk9GYGHv5AD_mS08uSNsmB4QdA2WbQHTIYMR2kVLrYmJVqXI9q6Zmr8khMlbqOCxvYbzhl1jnctmV2z_OnZbjli2T9QOzB0TZsrS1R9x70EYmLtoerGX1eAIAAP__.0wvOuo6VUjar3ngMidARPex7UIAp9IPBRS4bI5vYWwQ',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',