centaline-data-driven 1.4.35 → 1.4.36

package/package.json

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

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

@@ -104,6 +104,9 @@
           else if (v.show !== false && v.type === 'btn' && v.id === 'btnFilter') {
             this.filterBtnName = v.label;
           }
+          if(v.type !== 'btn'){
+            v.action='search';
+          }
         });
 
       },

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

@@ -2,16 +2,18 @@
   <div style="padding:0 8px 0 10px">
     <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"
+                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">
+                @current-change="handleCurrentChange"
+                @cell-click="handleCellClick">
         <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>
       </el-table>
       <div style="margin-top: 20px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">
+        <span class="ct-table-tip-mini" v-if="!loading && model" v-html="model.footer"></span> <span class="ct-table-tip-mini" v-if="!loading && model" style="color:red;">已勾选 {{selectCount}} 条</span>
         <el-input v-if="jumpBtnName" size="mini" v-model="jumpStr" placeholder="定位" style="width:150px"></el-input>
         <el-button v-if="jumpBtnName" size="mini" @click="jumpClickHandler()">{{jumpBtnName}}</el-button>
         <el-button v-if="filterBtnName" size="mini" @click="filterClickHandler()" style="margin-left: 0px;">{{filterBtnName}}</el-button>
@@ -48,7 +50,8 @@
         loading: true,
         jumpStr: '',
         isBusy:false,
-        elTableHeight:0,
+        elTableHeight: 0,
+        selectCount:0
       }
     },   
     methods: {
@@ -62,7 +65,6 @@
           var selectWrap = this.$refs.multipleTable.bodyWrapper;
           selectWrap.addEventListener('scroll', this.scrollHandle);
         });
-
         //通知父组件加载完成
         this.$emit('loaded');
       },
@@ -101,11 +103,15 @@
       //当多选项发生变化时会触发该事件
       handleSelectionChange(val) {
         this.multipleSelection = val;
+        this.selectCount = this.$refs.multipleTable.selection.length;
       },
       //当单选项发生变化时会触发该事件
       handleCurrentChange(val) {
         this.currentRow = val;
       },
+      handleCellClick(row) {
+        this.model.selectIndex = row.tableIndex;
+      },
       filterClickHandler() {
         this.tableData = this.multipleSelection;