centaline-data-driven 1.2.36 → 1.2.39

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.36",
+  "version": "1.2.39",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1"} ,
+        apiParam: {actionType: 1,chanceID: "2"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/api/third-dept-tran/profit-return/applyUI'" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/PropertyRET/getLayoutOfNewStepOne'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/Flow/readDetail'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
@@ -17,7 +17,7 @@
         // apiParam: {profitReturnId: "1504359257134055426", actionType: 1, pageStyle: 2, pageTitle: "查看返利", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
-        apiParam: {actionType: "2", pageStyle: "2", pageTitle: "新增盘源", pageOnly: "true"},
+        apiParam: {actionType: "2",jsonData: {}},
       }
     },
     methods: {

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/dynamicBtn/src/dynamicBtn.vue

@@ -5,7 +5,7 @@
                placement="bottom"
                @click.native="dropClick" 
                @command="commandClick"
-               :disabled="model.disabled">
+               :disabled="model.disabled || model.locked">
     <el-button type="primary">
       {{model.label}}<i class="el-icon-arrow-down el-icon--right"></i>
     </el-button>
@@ -13,15 +13,7 @@
       <el-dropdown-item v-for="item in model.elementOptions" :key="item.code" :command="item.code">{{item.name}}</el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
-  <el-button v-else-if="!model.isImport"
-             :type="model.isHyperLink ? 'text' : 'primary'"
-             v-bind="model.attrs" @click="$emit('click',model)"
-             :style="{color:model.textColor,backgroundColor:model.bgColor,borderColor:model.borderColor}"
-             :icon="model.icon"
-             :disabled="model.disabled">
-             <!-- <i v-if="model.isShowIocn" :class="model.iconClass"></i> -->
-             {{model.label}}</el-button>
-  <el-upload v-else
+  <el-upload v-else-if="model.isImport"
              :action="model.action"
              v-bind="model.attrs"
              size="mini"
@@ -33,6 +25,23 @@
              :on-error="handleAvatarError">
     <el-button size="mini" type="primary">{{model.label}}</el-button>
   </el-upload>
+  <el-button v-else-if="model.subText" style="height: 100%;padding: 5px 0;"
+             :type="model.isHyperLink ? 'text' : 'primary'"
+             v-bind="model.attrs" @click="$emit('click',model)"
+             :style="{color:model.textColor,backgroundColor:model.bgColor,borderColor:model.borderColor}"
+             :icon="model.icon"
+             :disabled="model.disabled || model.locked">
+             <div>{{model.label}}</div>
+             <div style="color:red;font-weight:700;">{{model.subText}}</div>             
+  </el-button>
+  <el-button v-else
+             :type="model.isHyperLink ? 'text' : 'primary'"
+             v-bind="model.attrs" @click="$emit('click',model)"
+             :style="{color:model.textColor,backgroundColor:model.bgColor,borderColor:model.borderColor}"
+             :icon="model.icon"
+             :disabled="model.disabled || model.locked">
+             {{model.label}}
+  </el-button>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement'

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

@@ -40,7 +40,6 @@
     created() {
       var self = this;
       this.$nextTick(function () {
-
         if (self.vmodel) {
           self.load(self.vmodel);
           self.$emit('loaded');

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -510,7 +510,7 @@
   }
 .ct-searchtable .ct-table {
     min-width: 100%;
-    border-collapse: separate;
+    border-collapse: collapse;
   }
     .ct-searchtable .ct-table th {
       background-color: #f4f7fa !important;

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

@@ -178,7 +178,7 @@
                     <span class="i">{{col.operationName}}</span>
                   </div>
                   <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
-                  <div class="t-item" style="height: 50px;">
+                  <div class="t-item" style="min-height: 50px;">
                     <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
                   </div>
                 </div>                  

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

@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading" style="width:100%">
+  <div v-loading="loading" :style="{width:pageWidth?pageWidth+'px':'100%',margin:'auto'}">
     <div v-if="model !== null && !loading" class="ct-form"  :class="{'domDisabled':model.pageDisabled}">
       <!--可根据场景判断显示el-card还是el-main-->
       <component :is="model.showTitle?'el-main':'el-card'">
@@ -95,6 +95,7 @@
       source: Object,
       apiParam: Object,
       parentModel: Object,
+      pageWidth: Number,
       showTitle: {
         type: Boolean,
         default: false
@@ -380,7 +381,7 @@
               }
               else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
                 submitData = field.getActionPara(submitData).para;
-                self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
+                self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle,self.model,field.dialogWidth);
               }
               else if (field.isBrowserNewTab) {// 浏览器打开
                 submitData = field.getActionPara(submitData).para;

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="field-top">
-    <div style="width:100;" v-if="model !== null" class="ct-inputNumber" :class="[model.attrs.size?'ct-font-size-'+model.attrs.size:'',model.lock ? 'ct-inputNumber-lock' : ''
+    <div style="width:100%;display:flex;">
+    <div style="flex:1;" v-if="model !== null" class="ct-inputNumber" :class="[model.attrs.size?'ct-font-size-'+model.attrs.size:'',model.lock ? 'ct-inputNumber-lock' : ''
        ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
       <div class="ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
@@ -23,13 +24,14 @@
           <span v-if="model.unitName" class="ct-unitname el-input__suffix el-input__suffix-inner" :class="showClear?'unitName-20':'unitName-0'">{{model.unitName}}</span>
         </div>
         <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
-        <transition name="el-fade-in ct-flex-div-span">
-          <span v-show="!valid" class="errorMessage">
-            {{validMessage}}
-          </span>
-        </transition>
       </div>
     </div>
+    <transition name="el-fade-in ct-flex-div-span">
+      <span v-show="!valid" class="errorMessage">
+        {{validMessage}}
+      </span>
+    </transition>
+  </div>
   </div>
 </template>
 <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,167 @@
+<template>
+  <div class="ct-form-repeat" 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="list-title">
+      <h5>{{model.title}}</h5>
+    </div>
+    <div class="el-col el-col-24 ct-form-repeat-el-col"  v-for="(v, i) in model.tableData" :key="v.guid" v-if="!v.deleted">
+      <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-delete" @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>
+ 
+  .ct-form-repeat {
+    display: table;
+    background: aliceblue;
+    padding:10px;
+  }
+
+    .ct-form-repeat .list-title {
+      padding-bottom: 5px;
+      text-align: left;
+      display: inline-table;
+      width: 45%;
+    }
+
+    .ct-form-repeat .list-button {
+      padding-bottom: 5px;
+      text-align: right;
+      display: inline-table;
+      float: right;
+    }
+    .ct-form-repeat .ct-form-repeat-el-col {
+      border-bottom: 1px dashed #f1706b;
+    }
+      .ct-form-repeat .ct-form-repeat-el-col:last-child {
+        border-bottom: none;
+      }
+
+
+</style>

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

@@ -99,6 +99,8 @@
                 </ct-tablecurrency>
 
                 <!--正常的列-->
+                <div v-else-if="column.flagHtml" v-html="row[column.id]" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :style="column.style ? column.style:''">                  
+                </div>
                 <div v-else-if="typeof column.template === 'undefined'" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :style="column.style ? column.style:''">
                   {{row[column.id]}}
                 </div>
@@ -463,6 +465,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) {
@@ -522,12 +525,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;
@@ -680,7 +679,7 @@
               if (field.pageStyle) {
                 submitData.pageStyle = field.pageStyle;
               }
-              self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model);
+              self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
@@ -833,25 +832,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;
@@ -916,11 +905,12 @@
     border-bottom: 1px solid #ebeef5;
     width: 100%;
     outline: 0;
+    border-top: 1px solid #fff;
   }
 
   .ct-searchtable .ct-table {
     min-width: 100%;
-    border-collapse: separate;
+    border-collapse: collapse;
   }
 
     .ct-searchtable .ct-table th {