centaline-data-driven 1.3.49 → 1.3.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.49",
+  "version": "1.3.50",
   "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="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/commissionmanage/apply'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,11 +12,7 @@
     data() {
       return {
         apiParam:{
-          actionType: 3,
-originalTraId: "1556877589776220161",
-pageOnly: true,
-pageStyle: 2,
-pageTitle: "成交报告"
+          
         },
         topHeight:10,
       }

package/src/centaline/css/max.css

@@ -280,3 +280,16 @@
     justify-content: flex-start;
     align-items: center;
 }
+.max-tableToolbar {
+    padding-top: 10px !important;
+}
+ .st-serach-screen .max-shortcutFollow {
+    padding-left: 0px !important;
+	padding-bottom: 10px !important;
+}
+.st-serach-screen .max-list-field {
+    padding-left: 0px !important;
+}
+.st-serach-screen .max-ptb5 {
+    padding-bottom: 5px !important;
+}

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -7,7 +7,7 @@
         </div>
         <div class="ct-checkbox-mian cover-list-item" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'',model.label?'':'lableNaN']">
           <el-checkbox-group v-model="model.checkedItemArr" @change="changeHandler1">
-            <el-checkbox :disabled="model.lock" v-for="item in model.options" :label="item[model.optionAttrs.value]" :key="item[model.optionAttrs.value]">{{item[model.optionAttrs.label]}}</el-checkbox>          
+            <el-checkbox :disabled="model.lock" v-for="item in model.options" :label="item[model.optionAttrs.value]" :key="item[model.optionAttrs.value]" :style="{ width: model.width1 + 'px' }">{{item[model.optionAttrs.label]}}</el-checkbox>          
             <span v-if="!model.lock" class="cover-list-item-span max-cover-list-item">
               <i class="el-input__icon el-icon-circle-close" @click="clearClickHandle"></i>
             </span>

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

@@ -1223,6 +1223,7 @@ export default {
 
           .hous-t {
             width: 260px;
+			margin-top: 10px;
             .swiper-i {
               position: relative;
               width: 100%;

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

@@ -1255,6 +1255,7 @@ export default {
 
           .hous-t {
             width: 260px;
+			margin-top: 10px;
             .swiper-i {
               position: relative;
               width: 100%;

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchList.vue

@@ -1,9 +1,8 @@
 <template>
   <div v-loading="loading" style="width:100%">
     <div v-if="model !== null && !loading" class="ct-form">
-      <div class="ct-ptb5 max-flex">
+      <div ref="search" class="ct-ptb5 max-flex">
         <template v-for="(col, index) in model.fields" v-if="col.show !== false">
-         <!-- <br v-if="col.is === 'ct-linefeed'" /> -->
           <div v-if="col.is === 'ct-linefeed'" style="width: 100%;">
             <el-divider></el-divider>
           </div>
@@ -67,6 +66,7 @@
         }
         this.loadFields();
         this.$nextTick(() => {
+          this.$refs.table.setELTableHeight(this.$el.parentElement.clientHeight,this.$refs.search.clientHeight)
           this.$refs.table.searchComplate(this.model,this.model.flagSearch);
         });
         this.loading = false;

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue

@@ -1,20 +1,12 @@
 <template>
   <div style="padding:0 8px 0 10px">
-    <div v-if="model !== null && !loading">
-      <el-table ref="multipleTable"
-                :data="tableData"
-                highlight-current-row
-                tooltip-effect="dark"
-                size="mini"
-                style="width: 100%;"
-                max-height="450"
-                fit
-                :row-class-name="tableRowClassName"
+    <div v-if="model !== null">
+      <el-table ref="multipleTable" :data="tableData"
+                highlight-current-row tooltip-effect="dark" size="mini" style="width: 100%;"  fit  :row-class-name="tableRowClassName"
+                :height="elTableHeight" v-loading="loading"
                 @selection-change="handleSelectionChange"
                 @current-change="handleCurrentChange">
-        <el-table-column type="selection"
-                         width="55" v-if="!singleSelectio">
-        </el-table-column>
+        <el-table-column type="selection" width="55" v-if="!singleSelectio"></el-table-column>
         <el-table-column v-for="(col, index) in model.columns" v-if="col.show" :key="index"
                          :prop="col.id" :label="col.name" :min-width="col.width">
         </el-table-column>
@@ -26,7 +18,7 @@
         <el-button size="mini" @click="confirmClickHandler()" class="max-search-btn" style="float:right;" type="primary">确认</el-button>
       </div>
     </div>
-    <div style="min-height:250px" v-loading="loading" v-if="loading"></div>
+    <div style="min-height:250px;" v-loading="loadingOne" v-if="loadingOne"></div>
     </div>
 </template>
 
@@ -52,16 +44,24 @@
         tableData: [],
         multipleSelection: [],
         currentRow: null,
+        loadingOne: true,
         loading: true,
-        jumpStr: ''
+        jumpStr: '',
+        isBusy:false,
+        elTableHeight:0,
       }
     },   
     methods: {
       load(data) {
+        this.loadingOne=false;
         this.model = data;
         this.loadFields();
         this.loading = false;
         this.resetTabelWidth();
+        this.$nextTick(() => {
+          var selectWrap = this.$refs.multipleTable.bodyWrapper;
+          selectWrap.addEventListener('scroll', this.scrollHandle);
+        });
 
         //通知父组件加载完成
         this.$emit('loaded');
@@ -82,7 +82,6 @@
           this.multipleSelection = [];
         }
 
-        //self.tableData.concat(this.model.listData);
         self.tableData.push.apply(self.tableData, this.model.listData);
       },
       //是否需要保留已选
@@ -215,7 +214,31 @@
             self.load(self.vmodel);
           }
         });
-      }
+      },
+      scrollHandle(ev) {
+        var self = this;
+        let selectWrap = this.$refs.multipleTable.bodyWrapper;
+        if (selectWrap.scrollTop +  selectWrap.clientHeight >= selectWrap.scrollHeight - 5) {
+          if (!self.isBusy) {
+            self.isBusy = true;
+            self.loading = true;
+            self.model.nextPage((rtn,response) => {
+              if (rtn) {
+                response.content.rows.forEach((nr) => {
+                  self.tableData.push(nr);
+                });
+              }
+              self.isBusy = false;
+              self.loading = false;
+            });
+          }
+        }
+        ev.cancelBubble = true;
+        ev.stopPropagation();
+      },
+      setELTableHeight(h0,h1){
+        this.elTableHeight=h0-h1-60-25;
+      },
     }
   }
 </script>

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

@@ -1,14 +1,14 @@
 <template>
   <div class="st-serach-screen">
     <div v-bind="model.attrs" style="width:100%" v-if="!isLoading">
-      <div class="ct-ptb5" v-if="showScreen">
+      <div class="ct-ptb5 max-ptb5" v-if="showScreen">
         <template v-for="(col, index) in model.screen" v-if="col.show !== false">
           <br v-if="col.is === 'ct-linefeed'" />
-          <component v-else class="list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
+          <component v-else class="list-field max-list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
         </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="shortcutFollow" style="padding-left: 20px;" v-if="model.shortcutForm">
+      <div class="shortcutFollow max-shortcutFollow" style="padding-left: 20px;" v-if="model.shortcutForm">
         <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut"></ct-form>
       </div>
       <el-popover class="SeachScreenPop max-seachpopper" placement="top" transition="el-zoom-in-top" v-model="highScreen" trigger="click" visible-arrow="false">

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

@@ -626,11 +626,7 @@ export default {
     },
     scrollHandle(ev) {
       var self = this;
-      if (
-        this.$refs.tableParent.scrollTop +
-          this.$refs.tableParent.clientHeight >=
-        this.$refs.tableParent.scrollHeight - 5
-      ) {
+      if ( this.$refs.tableParent.scrollTop +  this.$refs.tableParent.clientHeight >= this.$refs.tableParent.scrollHeight - 5) {
         if (!this.isBusy) {
           self.isBusy = true;
           self.tableLoading = true;
@@ -644,11 +640,7 @@ export default {
           });
         }
       }
-      this.$emit(
-        "scrollHandle",
-        this.$refs.tableParent.scrollTop,
-        this.$refs.tableParent.scrollLeft
-      );
+      this.$emit("scrollHandle", this.$refs.tableParent.scrollTop, this.$refs.tableParent.scrollLeft);
       ev.cancelBubble = true;
       ev.stopPropagation();
     },

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="ct-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
+  <div class="ct-tableToolbar max-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
   
 <div v-if="buttonsLeft&&buttonsLeft.length>0" class="bool_btn_l">
   <ul>