centaline-data-driven 1.2.35 → 1.2.38

package/build/centaline/centaline.path.js

@@ -42,6 +42,7 @@ const paths = {
     "dynamicPhotoSelect": "./src/centaline/dynamicPhotoSelect/index.js",//图片
     "dynamicPhotoSelectList": "./src/centaline/dynamicPhotoSelectList/index.js",//图片选择列表
     "dynamicViewer": "./src/centaline/dynamicViewer/index.js",//图片选择列表
+    "dynamicRepeat": "./src/centaline/dynamicRepeat/index.js",//重复控件
   },
   "plugs": {
     "api": "./src/centaline/api/index.js",//调用API插件

package/package.json

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

package/src/SearchList.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="app-search" style="height:100%;position: fixed;">
-    <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'" :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
-    <ct-searchlist :searchConditionApi="'/PropertyPublishLogList/getLayoutOfSearch'" :searchDataApi="'/PropertyPublishLogList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyPublishLogList/getLayoutOfSearch'" :searchDataApi="'/PropertyPublishLogList/getListOfSearchModel'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -23,8 +23,8 @@
     name: 'DataDrivenSearch',
     data() {
       return {
-        //para: { agentId: "1424932685198864386", estateId: "L201402181627000007233", estateName: "271医院宿舍区", pageOnly: "true", pageTitle: "销控房源列表" }
-        para: {publishID: "1503900718229229568"}
+        para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
+        // para: {publishID: "1503900718229229568"}
         // para: {paramKey: "PropertyStatusID", code: "002.001", name: "盘源状态", paramName: "盘源状态"}
       }
     },

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -244,7 +244,7 @@
         var self = this;
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
-        
+                   
         var clickAcion = function (field) {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
@@ -262,6 +262,9 @@
                     self.model.pageDisabled= true;
                     field.doAction(self.getFormObj(), (data) => {
                       if (data.rtnCode === 200) {
+                        if(data.notification===17){
+                          self.clickHandler(self.model.getRtnRouter(data.content),null)
+                        }
                         if (self.model.flagAlertClose) {
                           self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
                             confirmButtonText: '确定',
@@ -397,7 +400,7 @@
             }
             submitData = field.getActionPara(submitData).para;
             let title=field.pageTitle==undefined ?field.label:field.pageTitle;
-            submitData.actionType=field.actionType;
+            submitData.actionType=field.actionType; 
             var fun =self.$common.getDataDrivenOpts().handler[field.action];
             fun(submitData,title,self.model);
           }
@@ -572,8 +575,7 @@
            return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
         }
         return formData;
-      },
-     
+      },     
     }
   }
 </script>

package/src/centaline/dynamicRepeat/index.js

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

package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue

@@ -0,0 +1,186 @@
+<template>
+  <div class="ct-form-list" v-focus="foucus" :class="{'tableDisabled':model.tableDisabled}">
+    <div class="list-button">
+      <el-button v-if="model.create" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+        新增
+      </el-button>
+    </div>
+
+    <div class="el-col el-col-24" v-for="(v, i) in model.tableData" :key="v.guid" v-if="!v.deleted">
+      <div class="list-title">
+        <h5>{{model.title}}</h5>
+      </div>
+      <el-row v-if="v.field.length > 0">
+        <el-col v-for="(col, index) in v.field" :key="col.guid" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
+          <component ref="Fields" :is="col.is" :vmodel="col" :api="model.OptApi" v-bind="col.bindPara"
+                     @click="fieldClickHandler(col,index,i)" @change="changeHandler(col,index,i)"
+                     @input="inputHandler(col,index,i)"></component>
+        </el-col>
+      </el-row>
+      <div class="list-button" v-if="i>0">
+        <el-button v-if="v.delete" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="deleteRow(i)">
+          删除
+        </el-button>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  //Form内表格
+  var ctSpan = {//临时的span组件对象，用于vue双向绑定，强制更新
+    props: {
+      vmodel: Object,
+      rowNum: Number,
+    },
+    data: function () {
+      return {
+
+      }
+    },
+    methods: {
+      getClass() {
+        if (this.vmodel.is === "ct-inputNumber") {
+          return 'ct-table-inputnumber';
+        }
+      }
+    },
+    template: '<div :class="getClass()">{{vmodel.labelValue}}{{vmodel.unitName}}</div>'
+  }
+
+  export default {
+    name: 'ct-repeat',
+    components: {
+      'ct-span': ctSpan
+    },
+    props: {
+      vmodel: Object,
+      api: String
+    },
+    data() {
+      return {
+        model: null,
+        foucus: false,
+        itemKey: Math.random()
+      }
+    },
+    created() {
+      let self = this;
+      this.model = this.vmodel;
+      this.model.OptApi = this.api;
+
+      this.$nextTick(function () {
+        self.model.refField = this.$refs.Fields;
+        self.model.refFieldsLabel = this.$refs.FieldsLabel;
+      });
+    },
+    methods: {
+      //添加
+      addRow() {
+        var app = this;
+        if (app.fieldsValidExcute()) {
+          let newRow = app.model.getCloneRowData(0)
+          app.model.tableData.push(newRow);
+          app.model.addSourceRow();
+        }
+      },
+      //删除
+      deleteRow(index) {
+        var self = this;
+        this.model.deleteRow(index + 1, () => {
+          self.model.tableData[index].deleted = true;
+          self.$forceUpdate();
+          self.model.change = self.model.formListChange;
+          self.$emit('change');
+        });
+      },
+      fieldsValidExcute() {
+        var self = this;
+        var rtnBool = true;
+        debugger
+        if (typeof self.$refs.Fields !== 'undefined') {
+          self.$refs.Fields.forEach((f) => {
+            if (typeof f.validExcute !== 'undefined') {
+              if (!f.validExcute()) {
+                rtnBool = false;
+              }
+            }
+          });
+        }
+        return rtnBool;
+      },
+      validExcute() {
+        var self = this;
+        var rtnBool = true;
+        if (!self.fieldsValidExcute()) {
+          rtnBool = false;
+        } 
+        if (rtnBool && self.model.required && this.model.tableData.length === 0) {
+          self.$message.warning(this.model.label + " 表格不能为空");
+          rtnBool = false;
+        }
+        return rtnBool;
+      },
+      changeHandler(field, rowindex,index) {
+        var self = this;
+        this.model.change = field.change;
+        self.$emit('change');
+      },
+      inputHandler(field, rowindex, index) {
+        var self = this;
+        this.model.input = field.input;//当前小组件事件作为大组件事件
+        self.$emit('input');
+
+      },
+    }
+  }
+</script>
+<style>
+  .el-table-add-row {
+    margin-top: 10px;
+    width: 100%;
+    height: 34px;
+    border: 1px dashed #c1c1cd;
+    border-radius: 3px;
+    cursor: pointer;
+    justify-content: center;
+    display: flex;
+    line-height: 34px;
+  }
+
+  .ct-form-list .list-title {
+    padding-bottom: 5px;
+    text-align: left;
+    display: inline-table;
+    width: 45%;
+  }
+
+  .ct-form-list .list-button {
+    padding-bottom: 5px;
+    text-align: right;
+    display: inline-table;
+    float: right;
+  }
+
+  .ct-table-inputnumber {
+    text-align: right;
+  }
+
+  .ct-form-list .el-table__footer-wrapper .el-table__footer .has-gutter div {
+    text-align: right;
+  }
+
+  .ct-form-list .el-table__footer-wrapper .el-table__footer .has-gutter tr td:first-child div {
+    text-align: left;
+  }
+
+  .ct-table-required {
+    color: red;
+  }
+
+  .tableDisabled {
+    pointer-events: none;
+    opacity: 0.4;
+  }
+</style>

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

@@ -3,7 +3,7 @@
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header"
                    v-if="!isLoading&&searchStatsApi"
                    :api="searchStatsApi"
-                   @searchStats="searchStats"
+                   @searchStats="searchStats"  @setTableHeight="setTableHeight"
                    :searchModel="model.searchModel"></ct-tableStats>
     <ct-tabletoolbar ref="toolbar" v-if="!isLoading" :buttons="model.buttons"
                      @click="toolbarClickHandler($event)"
@@ -463,6 +463,7 @@
       setTrLazyLoading() {
         this.pageRowMax = this.firstRow + this.displayRowNumber;
         this.pageRowMin = this.firstRow - this.displayRowNumber;
+        this.pageRowMin=this.pageRowMin>0?this.pageRowMin:0;
         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) {
@@ -505,7 +506,9 @@
             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 - 22;
+              var h7 =  this.$refs.tableStats?(this.$refs.tableStats.$el.offsetHeight+7 | 0):0;
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7-22;
+            console.log(tableHeight+"   "+h7);
             this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             this.$nextTick(() => {
               self.getScrollAttr();
@@ -520,12 +523,8 @@
             self.isBusy = true;
             self.tableLoading = true;
             self.model.nextPage((rtn) => {
-              if (rtn) {
-                self.$nextTick(() => {
-                  self.calculatingRowHeight();
-                  self.getScrollAttr();
-
-                });
+              if (rtn) {                
+                self.getScrollAttr();
                 self.$forceUpdate();
               }
               self.isBusy = false;
@@ -831,25 +830,15 @@
       },
       calculatingRowHeight() {
         let self = this;
-        let count = 0;
 
         //查询出所有没有设置$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) => {
+        self.model.listData.forEach((item, i) => {
+          if(item.$heigth === undefined || item.$heigth <= 0){
             if (self.$refs["rows." + i] && self.$refs["rows." + i].length > 0) {
-              self.$set(v, "$heigth", self.$refs["rows." + i][0].clientHeight);
+              self.$set(item, "$heigth", self.$refs["rows." + i][0].clientHeight);
             }
-          });
-        }
-
-        //for (let i = 0; i < self.model.listData.length; i++) {
-        //  if (self.$refs[]) {
-        //  }
-        //}
-        //self.$refs
+          }
+        });
       },
       updateCurrentRow(router,data) {
         let self = this;

package/src/centaline/dynamicSearchList/src/dynamicTableStats.vue

@@ -4,22 +4,46 @@
     <!--计算占用宽度-->
     <div style="position:relative" v-if="FlagStatistics">
       <div style="position:absolute;left:-10000px" class="tab-list">
-        <label v-for="(item, index) in data" class="btnTab" :class="[selectStats==item.code1?'active':'']" :ref="'StatisticsItem'+index">{{item.controlLabel}}</label>111
+        <label v-for="(item, index) in data" class="btnTab" :ref="'StatisticsItem'+index">
+          {{item.controlLabel}}
+        </label>
       </div>
     </div>
     <!--展示-->
     <div v-if="FlagStatistics" class="tab-list">
       <template v-if="showData.length===1">
-        <label class="btnTab" v-for="(item, index) in showData[0]" :class="[selectStats==item.code1?'active':'']" @click="handleClick($event,item)">{{item.controlLabel}}</label>
+        <div v-for="(item, index) in showData[0]" @click="handleClick($event,item)">
+          <ul class="btnTab">
+            <li :class="[selectStats==item.code1+'*'+item.controlLabel?'activecolor':'']">{{item.controlLabel}}</li>
+            <li class="tdcenter">
+              <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
+            </li>
+          </ul>
+        </div>
       </template>
       <template v-else-if="showData.length>1">
-        <label class="btnTab" v-for="(item, index) in showData[0]" :class="[selectStats==item.code1?'active':'']" @click="handleClick($event,item)">{{item.controlLabel}}</label>
-        <el-popover :append-to-table="option.appendId?option.appendId:''"
+        <div v-for="(item, index) in showData[0]" @click="handleClick($event,item)">
+          <ul class="btnTab">
+            <li :class="[selectStats==item.code1+'*'+item.controlLabel?'activecolor':'']">{{item.controlLabel}}</li>
+            <li class="tdcenter">
+              <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
+            </li>
+          </ul>
+        </div>
+        <el-popover :append-to-table="option.appendId?option.appendId:''" class="Stats-popover"
                     :placement="option.placement?option.placement:'left'"
-                    :trigger="option.trigger?option.trigger:''"
-                    class="tabl-el">
-          <label class="tablf" v-for="(item, index) in showData[1]" :class="[selectStats==item.code1?'active':'']" @click="handleClick($event,item)">{{item.controlLabel}}</label>
-          <i slot="reference" class="icon-more"></i>
+                    :trigger="option.trigger?option.trigger:''">
+          <div v-if="FlagStatistics" class="tab-list" style="border-bottom:none">
+            <div class="tablf" v-for="(item, index) in showData[1]" @click="handleClick($event,item)" style="text-align:left">
+              <ul class="btnTab">
+                <li :class="[selectStats==item.code1+'*'+item.controlLabel?'activecolor':'']">{{item.controlLabel}}</li>
+                <li class="tdcenter">
+                  <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
+                </li>
+              </ul>
+            </div>
+          </div>
+          <sapn slot="reference" class="icon-more">⋮</sapn>
 
         </el-popover>
       </template>
@@ -46,7 +70,7 @@
         option: {
           isHidden: true,//是否开启操作栏隐藏设置，默认开启
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
-          appendId: '.s-table',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
+          appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
           trigger: 'hover',//触发方式，传值可查看Popper UI组件trigger属性
           placement: 'bottom-start'//方向，传值可查看Popper UI组件placement属性
         },
@@ -67,9 +91,10 @@
         self.data = data.source.content;
         self.selectVa = "";
         if (self.data.length > 0) {
-          if (self.selectStats == []) {
-            debugger
-            self.selectStats = self.data[0].code1;
+          let i = self.data.findIndex(v => self.selectStats === (v.code1 + "*" + v.controlLabel));
+
+          if (i == -1 || self.selectStats == []) {
+            self.selectStats = self.data[0].code1 + "*" + self.data[0].controlLabel;
           }
           self.FlagStatistics = true;
           self.showStats();
@@ -111,12 +136,14 @@
             }
 
           }
+
+          self.$emit('setTableHeight');
         });
       },
       handleClick(ev, obj) {
         var self = this;
-        self.selectStats = obj.code1;
-        var fields = self.model.searchData(obj.fieldName1, obj.code1, obj.controlType, obj.searchDataType);
+        self.selectStats = obj.code1 + "*" + obj.controlLabel;
+        var fields = self.model.searchData(obj.fieldName1, obj.code1, obj.searchOperation, obj.searchDataType);
         var model = {
           "searchData": fields
         };
@@ -148,46 +175,73 @@
 </style>
 
 <style>
-
   .tab-list {
+      position:relative; 
+    margin-bottom: 10px; 
     height: 30px;
-    border-bottom: 1px solid #E0E0E0;
-    margin-bottom: 10px;
   }
 
-  .btnTab {
-    font-size: 14px !important;
-    font-weight: bold;
-    padding: 5px 20px;
-  }
-
-    .btnTab:hover ,.tablf:hover{
-      color: #ee5d56;
+    .tab-list .btnTab {
+      font-size: 14px !important;
+      font-weight: bold;
+      padding: 0px 20px 0px 20px;
+      cursor: pointer;
+      float: left;
+      list-style-type: none;
     }
-    .tabl-el{
+
+      .tab-list .btnTab:hover, .tab-list .tablf:hover {
+        color: #ee5d56;
+      }
+
+    .tab-list .tabl-el {
       max-width: 150px;
       box-shadow: 0 6px 12px rgb(0 0 0 / 18%);
     }
-  .tablf{
-    font-size: 14px !important;
-    font-weight: bold;
-    text-align: center;
-    padding: 5px 10px;
-    display: block;
-  }
-  .active {
-    color: #ee5d56 !important;
-    border-bottom: solid 3px #ee5d56 !important;
-    background: none;
-    border-radius: 0 !important;
-  }
 
-  .icon-more {
-    background: url(../../../assets/vertical.png)no-repeat;
-    background-size: 80% 80%;
-    height: 20px;
-    width: 7px;
-    display: inline-block;
-    vertical-align: bottom;
+    .tab-list .tablf {
+      font-size: 14px !important;
+      font-weight: bold;
+      text-align: center;
+      padding: 15px 10px;
+      display: block;
+    }
+
+    .tab-list .tdcenter {
+      line-height: 1px;
+      height: 1px;
+      text-align: center;
+    }
+
+    .tab-list .active {
+      color: #ee5d56 !important;
+      /* border-bottom-right-radius: 12px !important; */
+      /* border-top-right-radius: 11px; */
+      width: 20px;
+      border-bottom: #ee5d56 solid 3px; 
+    }
+
+    .tab-list .activecolor {
+      color: #ee5d56 !important;
+    }
+
+
+    .tab-list .btnTab span {
+      display: inline-block;
+    }
+
+    .tab-list .icon-more {
+      color: #ee5d56;
+      font-size: 20px;
+      font-weight: 900;
+      display: inline-block;
+      vertical-align: 0.5em;
+      margin-top: -3px;
+      cursor: pointer;
+    }
+
+  .Stats-popover {
+      position:absolute;
+      right:5px;
   }
 </style>

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

@@ -348,7 +348,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           rtn = true;
         }
         return rtn;
-      }
+      },
+      getRtnRouter(v){
+        var button = Router(v);
+        button.is = "ct-btn";
+        return button;
+      },
     };
     valid.InitForm(rtn);
     return rtn;