centaline-data-driven 1.3.26 → 1.3.29

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/salemanage/adjust/point/readDetail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,7 +14,11 @@
     data() {
       return {
         apiParam:{
-adjustID:"220704140952A0156309F316436CAEBA",actionType:3
+actionType: 3,
+originalTraId: "1547488795469586434",
+pageOnly: true,
+pageStyle: 2,
+pageTitle: "成交报告"
           }
       }
     },

package/src/SearchList.vue

@@ -8,9 +8,8 @@
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
     :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
-      :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
-      :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'">
+    <ct-searchlist :searchConditionApi="'/PropertyContactImportList/getLayoutOfSearch'" 
+      :searchDataApi="'/PropertyContactImportList/getListOfSearchModel'">
     </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"

package/src/centaline/css/ccai.css

@@ -1,4 +1,7 @@
 .ccai.ct-Sw .ct-radios {
    padding-top: 0px;
    padding-bottom: 0;
-  }
+}
+.ccai.button-absolute{
+   bottom: 26px;
+}

package/src/centaline/css/max.css

@@ -269,7 +269,6 @@
 }
 #dragAll .el-checkbox__input.is-checked+.el-checkbox__label{
     font-weight: 700;
-    font-size: 16px;
 }
 /* .dragItem .el-checkbox__input.is-checked .el-checkbox__inner,
 .dragItem .el-checkbox__input.is-indeterminate .el-checkbox__inner {

package/src/centaline/dynamicDragSort/src/dynamicDragSort.vue

@@ -2,9 +2,10 @@
     <!--使用draggable组件-->
     <div class="dragCol" ref="dragCol">
         <div class="dragItem dragHeader" ref="dragHeader">
-            <el-checkbox id="dragAll" v-model="checkAll" @change="handleAllChecked" class="checkbox-common">{{
-                    this.vmodel.label
-            }}
+            <el-checkbox id="dragAll" v-model="checkAll" :indeterminate="isIndeterminate" @change="handleAllChecked"
+                class="checkbox-common">{{
+                        this.vmodel.label
+                }}
             </el-checkbox>
             <span class="svgIcon">
                 <!-- <svg-icon icon-class="sort" style="cursor: pointer"></svg-icon> -->
@@ -12,8 +13,9 @@
         </div>
         <!-- <div class="dragMain" style="height:dragMainHeight;"> -->
         <div class="dragMain" ref="dragMain" :style="{ height: mainHeight }">
-            <draggable v-model="testList" :options="{ group: { name: 'itxst', pull: 'clone' }, sort: true }"
-                animation="300" :move="onMove" dragClass="dragClass" ghostClass="ghostClass" chosenClass="chosenClass"
+            <draggable v-model="testList"
+                :options="{ group: { name: 'itxst', pull: 'clone' }, sort: true }" animation="300"
+                :move="onMove" dragClass="dragClass" ghostClass="ghostClass" chosenClass="chosenClass"
                 @input="handleListChange($event)">
                 <transition-group>
                     <div class="dragItem canDragon" v-for="(item, index) in testList" :key="index" ref="dragItem">
@@ -51,7 +53,8 @@ export default {
             checkAll: true,
             //定义要被拖拽对象的数组
             testList: [],
-            mainHeight: 500
+            mainHeight: 500,
+            isIndeterminate: true
         };
     },
     watch: {
@@ -65,8 +68,14 @@ export default {
                     }
                     if (i === this.testList.length) {
                         this.checkAll = true;
+                        this.isIndeterminate = false
                     } else {
                         this.checkAll = false;
+                        if (i > 0 && i < this.testList.length) {
+                            this.isIndeterminate = true
+                        } else {
+                            this.isIndeterminate = false
+                        }
                     }
                 });
             },
@@ -74,12 +83,16 @@ export default {
         }
     },
     created() {
-        if (typeof this.vmodel === "undefined") {
-            this.model = this.loaderObj.DragSort(this.source);
-        } else {
-            this.model = this.vmodel;
-            this.testList = this.vmodel.dragList;
-        }
+        this.$nextTick(function () {
+            if (typeof this.vmodel === 'undefined') {
+                this.model = this.loaderObj.DragSort(this.source);
+            }
+            else {
+                this.model = this.vmodel;
+                this.testList = this.vmodel.dragList;
+                // console.log('this.testList', this.testList);
+            }
+        });
 
         this.testList.forEach(item => {
             // 处理后端传过来的数据,如果没有可以判断是否勾选复选框的字段,则需给数据作处理,加上一个isChecked字段,判断复选框勾选
@@ -99,16 +112,17 @@ export default {
                 let screenHeight = document.body.clientHeight;
                 let dragHeaderHeight = this.$refs.dragHeader.offsetHeight;
                 let dragMainHeight = this.$refs.dragMain.style.height;
-                let num = this.testList.length
-                let dragItemAll = 44.68 * num;
                 dragMainHeight =
                     screenHeight - dragHeaderHeight - 26 - 8 - 44 - 40;
+                this.mainHeight = dragMainHeight + "px";
+                let num = this.testList.length
+                let dragItemAll = 44.68 * num;
                 if (dragMainHeight > dragItemAll) {
                     this.mainHeight = dragItemAll + "px";
                     this.$refs.dragMain.style.overflowY = 'hidden'
                 } else {
                     this.mainHeight = dragMainHeight + "px";
-                    this.$refs.dragMain.style.overflowY = 'scroll'
+                    this.$refs.dragMain.style.overflowY = 'overlay'
                 }
 
             });
@@ -217,7 +231,7 @@ export default {
 .dragHeader {}
 
 .dragMain {
-    overflow-y: scroll;
+    overflow-y: overlay;
     overflow-x: hidden;
 }
 

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

@@ -68,7 +68,8 @@
             <component v-for="(btn, index) in model.links" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
           </el-col>
         </el-row>
-        <el-row v-if="model.buttons.findIndex((v)=>{return v.show}) > -1" :class="isScroll?'button-absolute':'button-initial'">
+        <el-row v-if="model.buttons.findIndex((v)=>{return v.show}) > -1" :class="isScroll?'ccai button-absolute':'button-initial'"
+          :style="{'max-width':pageWidth?(pageWidth-20)+'px':'100%'}">
           <el-col :span="24" style="text-align:center">
             <component v-for="(btn, index) in model.buttons" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
           </el-col>
@@ -116,7 +117,8 @@
       this.init();
     },
     updated(){
-      if(this.$el.parentElement.scrollHeight>this.$el.parentElement.clientHeight){
+      if(this.$el.parentElement.scrollHeight>this.$el.parentElement.clientHeight 
+      && !this.model.isHorizontalLayout){
         this.isScroll=true;
       }
     },
@@ -592,6 +594,7 @@
         var rtnBool = true;
         var jump = false;
         var i=0;
+        
         self.$refs.Fields.forEach((f) => {
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
@@ -617,7 +620,7 @@
 
               if (!jump) {
                 if (this.model.isHorizontalLayout) {//水平布局
-                  this.activeName = f.model.collapseName.toString();
+                  this.activeName = f.model.collapseName.toString()==='-1'?self.activeName:f.model.collapseName.toString();
                   jump = true;
                 }
                 else {//垂直布局
@@ -716,7 +719,6 @@
   background-color: #fff;
   width: 100%;
   margin: auto;
-  max-width: 800px;
   box-shadow: 0 2px 20px 0 rgb(0 0 0 / 10%);
   margin-left: -20px;
 }

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

@@ -16,7 +16,7 @@
             <!--数据列-->
             <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false">
               <template slot="header" slot-scope="scope">
-                <div  :class="[{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled},getHeadClass(v)]">
+                <div :class="[{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled},getHeadClass(v)]">
                   {{v.label}}
                 </div>
               </template>
@@ -32,8 +32,8 @@
                 </span>
                 <!--可点击的列-->
                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">
-                  <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].code1" :rowData="scope.row"
-                                  @click="rolRouterClickHandler">
+                  <span>{{scope.row.isSet}}</span>
+                  <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].code1" :rowData="scope.row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                 </span>
                 <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" ref="FieldsLabel"></ct-span>
@@ -191,7 +191,8 @@
           app.model.currentRow.isNew = false;
           app.model.currentRow.index = index;
           app.model.currentRow.isSet = true;
-          row.isSet = true;
+          row.isSet = true;          
+          app.itemKey = Math.random();
         }
       },
       //删除

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

@@ -1,7 +1,9 @@
 <template>
   <div class="ct-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
-    <ul>
-      <li v-for="btn in buttons" class="ct-ToolbarButton max-ToolbarButton">
+  
+<div v-if="buttonsLeft&&buttonsLeft.length>0" class="bool_btn_l">
+  <ul>
+   <li v-for="btn in buttonsLeft" class="ct-ToolbarButton max-ToolbarButton"  :class="{btn_r:btn.isRight}">
         <component :is="btn.is" :vmodel="btn"
                    @click="clickHandler(btn,$event)"
                    @importComplete="importComplete"
@@ -9,53 +11,86 @@
                   :optionApi="optionApi"
                    :fileData="getFileData(btn)"></component>
       </li>
-    </ul>
+   </ul>
+</div>
+     <div v-if="buttonsright&&buttonsright.length>0" class="bool_btn_r">
+  <ul>
+   <li v-for="btn in buttonsright" class="ct-ToolbarButton max-ToolbarButton"  :class="{btn_r:btn.isRight}">
+        <component :is="btn.is" :vmodel="btn"
+                   @click="clickHandler(btn,$event)"
+                   @importComplete="importComplete"
+                   v-if="btn.show"
+                  :optionApi="optionApi"
+                   :fileData="getFileData(btn)"></component>
+      </li>
+   </ul>
+</div>
+
+   
   </div>
 </template>
 <script>
-  export default {
-    name: 'ctTableToolbar',
-    props: {
-      buttons: Array,
-      searchModel: Object,
-      optionApi:String
-    },
-    data() {
-      return {};
+export default {
+  name: "ctTableToolbar",
+  props: {
+    buttons: Array,
+    searchModel: Object,
+    optionApi: String
+  },
+  data() {
+    return {
+      buttonsLeft: [],
+      buttonsright: []
+    };
+  },
+  created() {
+    this.buttons.forEach(v => {
+      if (v.isRight) {
+        this.buttonsright.push(v);
+      } else {
+        this.buttonsLeft.push(v);
+      }
+    });
+  },
+  methods: {
+    clickHandler(btn, ev) {
+      this.$emit("click", btn);
     },
-    methods: {
-      clickHandler(btn, ev) {
-        this.$emit('click', btn);
-      },
-      getFileData(btn) {
-        if (btn.flagAttachSearchCondition) {
-          return this.searchModel ? this.searchModel.searchData : {};
-        }
+    getFileData(btn) {
+      if (btn.flagAttachSearchCondition) {
         return this.searchModel ? this.searchModel.searchData : {};
-      },
-      importComplete(res) {
-        this.$emit('importComplete', res);
       }
+      return this.searchModel ? this.searchModel.searchData : {};
+    },
+    importComplete(res) {
+      this.$emit("importComplete", res);
     }
   }
+};
 </script>
 <style>
-  .ct-tableToolbar {
-    width:100%;
-    position:relative;
-    float:left;
-    padding:0 5px 10px 0px;
-    background-color:#fff;
-    border-radius: 6px;
-  }
-    .ct-tableToolbar ul {
-      list-style: none; /* 去掉ul前面的符号 */
-      margin: 0px; /* 与外界元素的距离为0 */
-      padding: 0px; /* 与内部元素的距离为0 */
-      width: auto; /* 宽度根据元素内容调整 */
-    }
-      .ct-tableToolbar ul li {
-        margin-right:5px;
-        float:left; /* 向左漂移，将竖排变为横排 */
-      }
+.ct-tableToolbar {
+  width: 100%;
+  position: relative;
+  float: left;
+  padding: 0 5px 10px 0px;
+  background-color: #fff;
+  border-radius: 6px;
+}
+.ct-tableToolbar ul {
+  list-style: none; /* 去掉ul前面的符号 */
+  margin: 0px; /* 与外界元素的距离为0 */
+  padding: 0px; /* 与内部元素的距离为0 */
+  width: auto; /* 宽度根据元素内容调整 */
+}
+.ct-tableToolbar ul li {
+  margin-right: 5px;
+  float: left; /* 向左漂移，将竖排变为横排 */
+}
+.bool_btn_l {
+  float: left !important;
+}
+.bool_btn_r {
+  float: right !important;
+}
 </style>

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

@@ -295,8 +295,8 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                 }
                 //正在编辑的行
                 else if (rowNum === null && listData.currentRowIndex === 0) {
-                    let fields = listData.currentRow.data;
-                    field = fields[fiedlId];
+                  let fields = listData.currentRow.data;
+                  field = fields[fiedlId];
                 }
                 //源数据
                 else {
@@ -306,17 +306,18 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
 
                     if (rowNum === 0 || (rowNum && fiedlId)) {
                     try {
-                        let fields = listData.rows[rowNum].field;
+                      let fields = listData.rows[rowNum].field;
                         field = fields.find((v) => {
                         return v.id === fiedlId;
-                        });
-                    } catch (e) {
-                        if (listData.rows.length <= rowNum) {
+                      });
+                    } 
+                    catch (e) {
+                      if (listData.rows.length <= rowNum) {
                         var checkMsg = "获取列表行索引超出界限";
                         this.message(checkMsg);
-                        }
-                    }
+                      }
                     }
+                  }
                 }
 
                 return { listData: listData, field: field };
@@ -350,13 +351,19 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             //若该行正在编辑，则取编辑状态的。
             if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
             && data.listData.currentRow.data.$sourceIndex === rowNum && data.listData.currentRow.isSet) {
-                return data.listData.currentRow.data[fiedlId].source[attrName];
+              if(fiedlId=='deleted' || fiedlId=='flagDeleted'){
+                return data.listData.currentRow.data.deleted || false;
+              }
+              return data.listData.currentRow.data[fiedlId].source[attrName];
             }
             else if (data && data.field) {
-                if (typeof defaultValue !== 'undefined' && data.listData.rows[rowNum].deleted) {//若该行被删除时，则直接返回默认值
-                    return defaultValue;
-                }
-                return data.field.source[attrName];
+              if (typeof defaultValue !== 'undefined' && data.listData.rows[rowNum].deleted) {//若该行被删除时，则直接返回默认值
+                  return defaultValue;
+              }
+              return data.field.source[attrName];
+            }
+            else if (data && (fiedlId=='deleted' || fiedlId=='flagDeleted')) {
+              return data.listData.rows[rowNum].deleted || false;
             }
         },
         getListFieldValueFromParent(tableName, rowNum, fiedlId, attrName, defaultValue) {

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

@@ -180,13 +180,10 @@ const FormList = function (source, master) {
         for (let i = 1; i < rows.length; i++) {//遍历每一行
           if (!rows[i].deleted) {
             row = {};
-            //row['$sourceIndex'] = i;
             Vue.set(row, '$sourceIndex', i);
             for (let j = 0; j < rows[i].field.length; j++) {//遍历每一列
-              //row[field[j].id] = rows[i].field[j];
               Vue.set(row, field[j].id, rows[i].field[j]);
             }
-            //row.isSet = false;
             Vue.set(row, 'isSet', false);
             Vue.set(row, 'edit', rows[i].edit);
             Vue.set(row, 'delete', rows[i].delete);
@@ -372,8 +369,6 @@ const FormList = function (source, master) {
     addSourceRow(row) {
       let sourceRow = JSON.parse(JSON.stringify(source.rows[0]));
       for (let k in sourceRow.columns) {
-        //sourceRow.Row[k] = row.field[k].source;
-        sourceRow.columns[k] = row[sourceRow.columns[k].fieldName1].source;
         sourceRow.columns[k] = row[sourceRow.columns[k].fieldName1].source;
       };
       source.rows.push(sourceRow);
@@ -425,9 +420,7 @@ const FormList = function (source, master) {
                 source.rows.push(row);
                 rtn.rows.push(rowItem);
                 rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
-
-                rowData.$sourceIndex = source.rows.length - 1;
-                
+                rowData.$sourceIndex = source.rows.length - 1;                
                 rowData.edit = rowItem.edit;
                 rowData.delete = rowItem.delete;
                 rowItem.isNewFlag = true;
@@ -473,13 +466,14 @@ const FormList = function (source, master) {
     insertRow(rows) {
       if(rows && rows.length>0){
         rows.forEach((r) => {
-          source.rows.push(r);
-          let iRow = this.initRow(r);
+          let iRow = rtn.initRow(r);
           iRow.isNewFlag = true;
+          source.rows.push(r);
           rtn._rows.push(iRow);
           Vue.set(r, 'edit', iRow.edit);
           Vue.set(r, 'delete', iRow.delete);
           rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
+          r.$sourceIndex = rtn._rows.length - 1;
 
           let rowData = rtn.rowsItemToTableData(iRow)
           rowData.$sourceIndex = rtn._rows.length - 1;      
@@ -492,43 +486,52 @@ const FormList = function (source, master) {
     insertOrUpdateRow(row) {
       if(row){
         if(rtn.primaryKeys && rtn.primaryKeys.length>0){
-          let iRow = this.initRow(row);
+          let iRow = rtn.initRow(row);
           let flagAdd=true;
           rtn.rows.forEach((r,i) => {
-            let countKey=0;
-            rtn.primaryKeys.forEach((k) => {
-              let fieldOld=r.field.find((v) => {
-                return v.id === k;
-              });
-              let fieldNew=iRow.field.find((v) => {
-                return v.id === k;
-              });
-              if(fieldOld.code1===fieldNew.code1){
-                countKey++;
-              }
-            })
-            if(countKey===rtn.primaryKeys.length){
-              flagAdd=false;
-              if(iRow.deleted){
-                rtn.tableData.forEach((d,index) => {
-                  if(d.$sourceIndex===r.$sourceIndex){
-                    rtn.tableData.splice(index, 1);
+            if(i>0){
+              let countKey=0;
+              rtn.primaryKeys.forEach((k) => {
+                let fieldOld=r.field.find((v) => {
+                  return v.id === k;
+                });
+                let fieldNew=iRow.field.find((v) => {
+                  return v.id === k;
+                });
+                if(fieldOld.code1===fieldNew.code1){
+                  countKey++;
+                }
+              })
+              if(countKey===rtn.primaryKeys.length){
+                flagAdd=false;
+                if(iRow.deleted){
+                  rtn.tableData.forEach((d,index) => {
+                    if(d.$sourceIndex===r.$sourceIndex){
+                      rtn.tableData.splice(index, 1);
+                    }
+                  });                
+                  if (r.isNewFlag) {
+                    rtn.rows.splice(i, 1);
+                    source.rows.splice(i, 1);
+                  }
+                  else {
+                    rtn.rows[i].deleted = true;
                   }
-                });                
-                if (r.isNewFlag) {
-                  rtn.rows.splice(i, 1);
-                  source.rows.splice(i, 1);
                 }
-                else {
-                  rtn.rows[i].deleted = true;
+                else{
+                  let rowData = rtn.rowsItemToTableData(iRow)
+                  iRow.$sourceIndex=r.$sourceIndex;
+                  rowData.$sourceIndex=r.$sourceIndex;    
+                  rowData.edit = iRow.edit;
+                  rowData.delete = iRow.delete;
+                  source.rows.splice(i, 1,row);
+                  rtn._rows.splice(i, 1,iRow);
+                  rtn._tableData.splice(i-1, 1,rowData);
                 }
               }
-              else{
-                rtn.rows.splice(i, 1,iRow);
-              }
             }
           });
-          if(flagAdd){         
+          if(flagAdd){
             let rows=[];
             rows.push(row);
             rtn.insertRow(rows)

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

@@ -350,6 +350,9 @@ const Router = function (source) {
     get align() {
       return source.align;
     },
+    get isRight() {
+      return Enum.HalignType.Right == source.align;
+    },
   };
   return rtn;
 }

package/src/main.js

@@ -14,8 +14,8 @@ Vue.config.productionTip = false;
 Vue.use(centaline, {
   baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.88.23.22:9999/v1/form/router",
-  // baseUrl: "http://10.88.22.69:8080/", 
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // baseUrl: "http://10.88.22.69:8080/", 
   // flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'a9e42494-1e0b-4c46-834e-eea096ba2564',
+        oldToken: '0e5e2554-abe0-4538-8520-e024f82389b3',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYzMzZiMDJiLTZjOGEtNDIzNC05MGQ5LTliYWI2MTIyNTQzNyJ9.hOxMvGLm03QMPu9C4lgRzkEHC7ECqxJ_L6mfqQRqv39xJ42I8gzSRO-E68vWp-A99ewnxnqvTZ6H_6fOQ9DljQ',