centaline-data-driven 1.1.20 → 1.1.25

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

@@ -1,11 +1,12 @@
 <template>
   <div style="width:100%;" class="ct-searchtable" ref="searchTable">
+    <ct-tableStatistics ref="listHeader" class="ct-search-table-list-header" :tip="model.listHeader" v-if="!isLoading && searchDataStatisticsApi"></ct-tableStatistics>
     <ct-tabletoolbar ref="toolbar" v-if="!isLoading" :buttons="model.buttons"
                      @click="toolbarClickHandler($event)"
                      @importComplete="importComplete"
+                     :optionApi="model.optionApi"
                      :searchModel="model.searchModel"></ct-tabletoolbar>
     <ct-tabletip ref="listHeader" class="ct-search-table-list-header" :tip="model.listHeader" v-if="!isLoading"></ct-tabletip>
-
     <div v-loading="tableLoading" v-if="!isLoading" :style="{'height':'0px','top':model.tableHeight*0.55+'px'}">
     </div>
     <div v-loading="operationLoading">
@@ -16,13 +17,13 @@
          @keydown.up="rowKeyDownHandle($event,0)" @keydown.down="rowKeyDownHandle($event,1)"
          tabindex="-1">
       <div class="ct-table-content">
-        <table border="0" cellpadding="0" cellspacing="0" 
+        <table border="0" cellpadding="0" cellspacing="0"
                :class="['ct-table',model.attrs.size?'ct-table-'+model.attrs.size:'']">
           <!--表头-->
           <thead ref="tableHead">
             <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr">
               <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th checkbox-td">
-                <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" />
+                <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" class="checkbox-td-1" />
               </th>
               <th :ref="column.fixed?(column.fixed==='left'?'headLeftThs':'headRightThs'):'headThs'" v-for="(column,colIndex) in columns"
                   v-if="column.show" class="ct-td ct-searchtable-th"
@@ -34,8 +35,7 @@
                   column.fixed === 'left'?'left-fixation-th':null,
                   column.fixed === 'right'?'right-fixation-th':null,
                   typeof column.fixed === 'undefined'?'right-no-fixation-th':null]"
-                  @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event,colIndex)"
-                  align="center"
+                  @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event,colIndex)"                 
                   v-bind="column.attrs">
 
                 <span>{{column.name}}</span>
@@ -54,14 +54,13 @@
           <tbody>
             <!--这一行仅用于设置未加载数据时的列宽-->
             <!--<tr v-if="model.listData.length === 0" class="ct-tr" style="visibility: hidden;">
-              <td v-if="model.isMulti">
-              </td>
-              <td v-for="(column,colIndex) in model.dataFieldcolumns" class="ct-td" v-if="column.show">
-                <div :style="{'width': column.width + 'px'}">
-                </div>
-              </td>
-            </tr>-->
-
+            <td v-if="model.isMulti">
+            </td>
+            <td v-for="(column,colIndex) in model.dataFieldcolumns" class="ct-td" v-if="column.show">
+              <div :style="{'width': column.width + 'px'}">
+              </div>
+            </td>
+          </tr>-->
             <!--可视区域的行数据-->
             <tr v-for="(row,rowindex) in model.listData"
                 v-if="pageRowMin <= rowindex && rowindex <= pageRowMax"
@@ -69,7 +68,7 @@
                 class="ct-tr"
                 :style="row.$style">
               <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" align="center">
-                <input v-if="!model.rightMulti || row[model.rightMulti] == 1" type="checkbox" v-model="row.$select"  @change="selectOne($event)" />
+                <input v-if="!model.rightMulti || row[model.rightMulti] == 1" type="checkbox" v-model="row.$select" @change="selectOne($event)" class="checkbox-td-1" />
               </td>
               <td :ref="column.fixed?(column.fixed==='left'?'headLeftTds':'headRightTds'):null"
                   v-for="(column,colIndex) in model.dataFieldcolumns"
@@ -90,7 +89,7 @@
                 </div>
 
                 <!--可点击的列-->
-                <ct-tablecurrency v-else-if="column.router" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :router="column.router" :colValue="row[column.id]" :rowData="row"
+                <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">
                 </ct-tablecurrency>
 
@@ -108,6 +107,8 @@
               </td>
             </tr>
 
+
+
             <!--适配滚动条-->
             <tr v-else v-bind:style="{ height: row.$heigth + 'px' }"></tr>
           </tbody>
@@ -124,17 +125,20 @@
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
   import dynamicTableTip from './dynamicTableTip.vue';
-  import dynamicTableToolbar from './dynamicTableToolbar.vue'
+  import dynamicTableToolbar from './dynamicTableToolbar.vue';
+  import dynamicTableStatistics from './dynamicTableStatistics.vue';
   export default {
     name: 'ct-searchtable',
     mixins: [dynamicElement],
     components: {
       'ct-tabletip': dynamicTableTip,
-      'ct-tabletoolbar': dynamicTableToolbar
+      'ct-tabletoolbar': dynamicTableToolbar,
+      'ct-tableStatistics': dynamicTableStatistics
     },
     props: {
       vmodel: Object,
-      api: String
+      api: String,
+      searchDataStatisticsApi: String
     },
     computed: {
     },
@@ -165,6 +169,7 @@
     },
     activated() {
       this.$nextTick(() => {
+        this.calculatingRowHeight();
         this.setTableHeight();
       })
     },
@@ -191,9 +196,14 @@
         self.$forceUpdate();
 
         self.$emit('loaded');
+        self.$emit('showTitle');
         if (this.tempSearchModel !== null) {
           self.model.searchModel = this.tempSearchModel;
         }
+        //自动查询 调用合并列
+        if (self.model.rowMergedColumns.length > 0 && self.model.listData.length > 0) {
+          self.model.setRow(self.model.listData);
+        }
         self.tableComplate = true;
         this.setTableHeight();
         this.$nextTick(() => {
@@ -312,8 +322,8 @@
                 self.tableLoading = false;
                 self.rowColorChange();
                 self.resetScroll();
-                self.getScrollAttr();
                 self.calculatingRowHeight();
+                self.getScrollAttr();
               }
               self.setfixedSize();
             });
@@ -398,6 +408,9 @@
       },
       getScrollAttr(e) {
         if (typeof this.$refs.tableParent !== 'undefined' && typeof this.$refs.headThs !== 'undefined') {
+
+          this.calculatingRowHeight();
+
           var scrollTop = this.$refs.tableParent.scrollTop;
           var scrollLeft = this.$refs.tableParent.scrollLeft;
           var scrollRight = this.$refs.tableParent.scrollWidth - scrollLeft - this.$refs.tableParent.clientWidth;
@@ -426,7 +439,6 @@
       setTrLazyLoading() {
         this.pageRowMax = this.firstRow + this.displayRowNumber;
         this.pageRowMin = this.firstRow - this.displayRowNumber;
-
         if (this.pageRowMin > 0 && this.model.listData[this.pageRowMin].$rowspan === 0) {
           for (let i = this.pageRowMin; i >= 0; i--) {
             if (this.model.listData[i].$rowspan > 0) {
@@ -469,8 +481,8 @@
             var h4 = this.$refs.footer.$el.offsetHeight | 0;
             var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
             var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - 10;
-
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - 30;
+            
             this.model.tableHeight = tableHeight < 50 ? 350 : tableHeight;
             this.$nextTick(() => {
               self.getScrollAttr();
@@ -629,12 +641,16 @@
       routerClickHandler(field, submitData, action) {
         let self = this;
         action = action || field.action;
-
+        
         var clickAcion = function () {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
             if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
+               if(field.pageStyle)
+              {
+                 submitData.pageStyle=field.pageStyle;
+              }
               self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model);
             }
             else if (field.isBrowserNewTab) {// 浏览器打开
@@ -775,12 +791,19 @@
       calculatingRowHeight() {
         let self = this;
         let count = 0;
-
-        self.model.listData.forEach((v, i) => {
-          if (typeof v.$heigth === "undefined" && self.$refs["rows." + i] && self.$refs["rows." + i].length > 0) {
-            self.$set(v, "$heigth", self.$refs["rows." + i][0].clientHeight);
-          }
-        });
+      
+        //查询出所有没有设置$heigth的数据并重新设置$heigth
+       let notHeigthData=  self.model.listData.filter(item=>{
+           return item.$heigth=== undefined || item.$heigth<=0
+        })
+        if(notHeigthData&&notHeigthData.length>0)
+        {
+           notHeigthData.forEach((v, i) => {
+           if (self.$refs["rows." + i] && self.$refs["rows." + i].length > 0) {
+              self.$set(v, "$heigth", self.$refs["rows." + i][0].clientHeight);
+            }
+          });
+        }
 
         //for (let i = 0; i < self.model.listData.length; i++) {
         //  if (self.$refs[]) {
@@ -855,9 +878,9 @@
   .ct-searchtable .ct-tr > .ct-td {
     /*border: 1px solid #e7e8eb;*/
     border-bottom: 1px solid #e7e8eb;
-    /*border-right: 1px solid #e7e8eb;*/
-    border-left: 1px solid #e7e8eb;
-    padding: 2px 10px;
+    /*border-right: 1px solid #e7e8eb;
+    border-left: 1px solid #e7e8eb;*/
+    padding: 2px 20px;
     cursor: default;
     background-color: #ffffff;
   }
@@ -1018,7 +1041,7 @@
   }
 
   .ct-table .ct-searchtable-th {
-    text-align: center
+    /*text-align: center*/
   }
 
   .ct-table .checkbox-td {
@@ -1026,4 +1049,7 @@
     width: 20px;
     left: 0px;
   }
+  .ct-table .checkbox-td .checkbox-td-1{
+    vertical-align: inherit;
+  }
 </style>

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

@@ -0,0 +1,41 @@
+<template>
+  <div class="ct-table-Statistics">
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane v-for="(item, index) in editableTabs" :key="item.name" :label="item.title" :name="item.name" lazy>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'ct-tableStatistics',
+    props: {
+      tip: String,
+      size: String
+    },
+    data() {
+      return {
+        activeName: '1',
+        editableTabs: [
+          { name: '1', title: '用户管理' },
+          { name: '2', title: '配置管理' },
+          { name: '3', title: '角色管理' },
+          { name: '4', title: '定时任务补偿' },
+          { name: '5', title: '定时任务补偿2' },
+          { name: '6', title: '定时任务补偿3' },
+          { name: '7', title: '定时任务补偿4' },
+          { name: '8', title: '定时任务补偿5' },
+          { name: '9', title: '定时任务补偿6' },
+          { name: '10', title: '定时任务补偿7' }
+        ],
+      }
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event);
+      }
+    }
+  }
+</script>
+<style>
+</style>

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

@@ -1,11 +1,12 @@
 <template>
   <div class="ct-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
     <ul>
-      <li v-for="btn in buttons" class="ct-ToolbarButton">
+      <li v-for="btn in buttons" class="ct-ToolbarButton max-ToolbarButton">
         <component :is="btn.is" :vmodel="btn"
                    @click="clickHandler(btn,$event)"
                    @importComplete="importComplete"
                    v-if="btn.show"
+                  :optionApi="optionApi"
                    :fileData="getFileData(btn)"></component>
       </li>
     </ul>
@@ -16,7 +17,8 @@
     name: 'ctTableToolbar',
     props: {
       buttons: Array,
-      searchModel: Object
+      searchModel: Object,
+      optionApi:String
     },
     data() {
       return {};
@@ -42,8 +44,9 @@
     width:100%;
     position:relative;
     float:left;
-    padding:10px;
-    background-color:#fafafa;
+    padding:0 15px 10px 15px;
+    background-color:#fff;
+    border-radius: 6px;
   }
     .ct-tableToolbar ul {
       list-style: none; /* 去掉ul前面的符号 */

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -1,21 +1,20 @@
 <template>
   <div class="field-top">
-    <div v-if="model !== null" class="ct-text ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']"
-    @mouseover="mouseOverHandle" @mouseout="mouseOutHandle"
-    >
-      <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
+    <div v-if="model !== null" class="ct-text ct-flex-div max-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']"
+         @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
+      <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div max-input-group" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
       <el-input :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event);isShowClear()" @change="changeHandler($event)"
-                class="ct-flex-div-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']" :disabled="model.lock" :rows="model.rows"
+                class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']" :disabled="model.lock" :rows="model.rows"
                 :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit">
         <span slot="suffix" v-if="model.unitName" class="ct-unitname">{{model.unitName}}</span>
-        
-         <span slot="suffix" class="el-input__suffix el-input--mini" v-if="showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
-            <span  class="el-input__suffix-inner ct-close">
-              <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
-            </span>
-       </span>
+
+        <span slot="suffix" class="el-input__suffix el-input--mini" v-if="showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
+          <span class="el-input__suffix-inner ct-close">
+            <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
+          </span>
+        </span>
       </el-input>
 
       <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
@@ -38,7 +37,7 @@
     },
     data() {
       return {
-        showClear:false,
+        showClear: false,
       }
     },
     created() {
@@ -49,10 +48,8 @@
         this.model = this.vmodel;
       }
     },
-    methods:{
-
+    methods: {
       mouseOverHandle: function () {
-    
         if (this.model.value !== '' && this.model.clearable) {
           this.$set(this, 'showClear', true);
         }
@@ -60,21 +57,19 @@
       mouseOutHandle: function () {
         this.$set(this, 'showClear', false);
       },
-       clearClickHandle: function (event) {
+      clearClickHandle: function (event) {
         this.model.value = '';
         this.isShowClear();
         event.stopPropagation();
       },
-      isShowClear()
-      {
-         if (this.model.value !== '' && this.model.clearable) {
+      isShowClear() {
+        if (this.model.value !== '' && this.model.clearable) {
           this.$set(this, 'showClear', true);
-        }else
-        {
-           this.$set(this, 'showClear', false);
+        } else {
+          this.$set(this, 'showClear', false);
         }
       },
     },
-}</script>
+  }</script>
 <style>
 </style>

package/src/centaline/dynamicTimeSelect/src/dynamicTimeSelect.vue

@@ -5,13 +5,44 @@
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
           {{model.label}}
         </div>
-        <div class="ct-datepicker" style="width:100%" v-if="model !== null" :class="[model.showLabel?'showLabel':'']">
+        <div class="ct-datepicker" style="width:100%" v-if="model !== null&&model.valueFormat=='HH:mm'" :class="[model.showLabel?'showLabel':'']">
+          <el-time-select class="ct-date-picker-editor" v-model="model.value"
+                          v-bind="model.attrs"
+                          @change="changeModel($event)"
+                          @clear="changeModel($event)"
+                          :placeholder="model.placeholder"
+                          :disabled="model.lock"
+                          :picker-options="{
+                            start:  model.min,
+                              step: model.step,
+                            end:  model.max
+                           }">
+          </el-time-select>
+          <span v-if="model.isRange" class="ct-date-picker-span">-</span>
+          <el-time-select v-if="model.isRange" class="ct-date-picker-editor" v-model="model.value1"
+                          v-bind="model.attrs"
+                          @change="changeModel($event)"
+                          @clear="changeModel($event)"
+                          :placeholder="model.placeholder1"
+                          :disabled="model.lock"
+                          :picker-options="{
+                            start: model.min,
+                            step: model.step,
+                            end: model.max,
+                            minTime: model.value
+                           }">
+          </el-time-select>
+        </div>
+        <div class="ct-datepicker" style="width:100%" v-else-if="model !== null" :class="[model.showLabel?'showLabel':'']">
           <el-time-picker class="ct-date-picker-editor" v-model="model.value"
                           v-bind="model.attrs"
                           @change="changeModel($event)"
                           @clear="changeModel($event)"
                           :placeholder="model.placeholder"
-                          :disabled="model.lock">
+                          :disabled="model.lock"
+                          :picker-options="{
+                            selectableRange:model.min + '-' + model.max
+                           }">
           </el-time-picker>
           <span v-if="model.isRange" class="ct-date-picker-span">-</span>
           <el-time-picker v-if="model.isRange" class="ct-date-picker-editor" v-model="model.value1"
@@ -19,7 +50,10 @@
                           @change="changeModel($event)"
                           @clear="changeModel($event)"
                           :placeholder="model.placeholder1"
-                          :disabled="model.lock">
+                          :disabled="model.lock"
+                          :picker-options="{
+                            selectableRange:model.min + '-' + model.max
+                           }">
           </el-time-picker>
         </div>
       </div>

package/src/centaline/dynamicTree/index.js

@@ -0,0 +1,11 @@
+import dynamicTree from './src/dynamicTreeList'
+
+dynamicTree.install = function (Vue) {
+  Vue.component(dynamicTree.name, dynamicTree);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicTree);
+}
+
+export default dynamicTree;

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <ct-searchtreescreen ref="treescreen" :api="searchConditionApi" :screenPara="screenPara" @search="search"></ct-searchtreescreen>
+    <ct-tree ref="tree" :api="searchDataApi" @loaded="loaded"></ct-tree>
+  </div>
+</template>
+
+<script>
+  import dynamicElement from '../../mixins/dynamicElement'
+  import dynamicTreeScreen from '../../dynamicSearchList/src/dynamicSearchScreen.vue';
+  import dynamicTree from './dynamicTree.vue';
+  export default {
+    name: 'ct-searchtree',
+    mixins: [dynamicElement],
+    components: {
+      'ct-tree': dynamicTree,
+      'ct-searchtreescreen': dynamicTreeScreen
+    },
+    props: {
+      vmodel: Object,
+      searchConditionApi: String,
+      searchDataApi: String,
+      flagsearch: Boolean,
+      screenPara: {
+        type: Object,
+        default: () => { }
+      }
+    },
+    data() {
+      return {
+
+      };
+    },
+    methods: {
+      search() {
+        this.$refs.tree.search(this.$refs.treescreen.model);
+      },
+      loaded(data) {
+        try {
+          this.$emit('loaded', data);
+        } catch (e) {
+        }
+      },
+    },
+    mounted() {
+      if (this.flagsearch) {
+        this.$watch('$refs.treescreen.model.searchData', function (newVal, oldVal) {
+          // 做点什么
+          if (oldVal != undefined) {
+            this.search();
+          }
+        }, {
+          deep: true,
+        });
+      }
+    },
+    watch: {
+      //filterText(val) {
+      //  this.$refs.trees.filter(val);
+      //}
+    },
+    created() {
+      this.model = this.vmodel;
+    }
+  }
+</script>