centaline-data-driven 1.2.49 → 1.2.52

package/build/centaline/centaline.path.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.49",
+  "version": "1.2.52",
   "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: "2"} ,
+        apiParam: {actionType: 1,chanceID: "1"} ,
       }
     },
     mounted() {

package/src/centaline/css/common.css

@@ -313,7 +313,8 @@ html {
    height: 26px;
    font-size: 12px;
    color: #ff5b5b !important;
-   padding: 3px 5px;
+   padding: 0 5px;
+   line-height: 26px;
    white-space: nowrap;
  }
  .spanMessage {
@@ -712,6 +713,7 @@ html {
 
 .el-date-editor .el-range-input, .el-date-editor .el-range-separator {
   font-size: 12px;
+  height: 22px;
 }
 .ct-text{
   position: relative

package/src/centaline/css/max.css

@@ -240,3 +240,4 @@
 .el-radio__input.is-checked + .el-radio__label {
     color: #409eff;
 }
+

package/src/centaline/dynamicCompound/index.js

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

package/src/centaline/dynamicCompound/src/dynamicCompound.vue

@@ -0,0 +1,89 @@
+<template>
+  <el-row v-if="model.fields.length > 0">
+    <el-col v-for="(col, index) in model.fields" :key="index" v-if="col.show !== false" :span="col.colspan" :class="index>0&&col.label==''?'complex-left-10':''">
+      <component ref="Fields" :is="col.is" :vmodel="col" :api="model.OptApi" v-bind="col.bindPara"
+                           @click="fieldClickHandler(col,index)" @change="changeHandler(col,index)"
+                           @input="inputHandler(col,index)"></component>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+  var ctSpan = {
+    props: {
+      vmodel: Object,
+    },
+    data: function () {
+      return {
+
+      }
+    },
+    methods: {
+      
+    },
+  }
+
+  export default {
+    name: 'ct-compound',
+    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;
+    },
+    methods: {
+      fieldsValidExcute() {
+        var self = this;
+        var rtnBool = true;
+        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;
+        } 
+        return rtnBool;
+      },
+      changeHandler(field,index) {
+        var self = this;
+        this.model.change = field.change;
+        self.$emit('change');
+      },
+      inputHandler(field, index) {
+        var self = this;
+        this.model.input = field.input;//当前小组件事件作为大组件事件
+        self.$emit('input');
+
+      },
+    }
+  }
+</script>
+<style>
+  .complex-left-10 {
+    padding-left: 10px;
+  }
+ 
+</style>

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

@@ -2,7 +2,9 @@
     <div>
       <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" class="ct-PropertyDetailOFI"  v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
       <ct-PropertyDetailRET :api="api" :apiParam="apiParam" class="ct-PropertyDetailRET"  v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
-      <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" class="ct-PropertySimpleDetailRET"  v-if="pageType=='PropertySimpleDetailRET'"></ct-PropertySimpleDetailRET>
+      <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-PropertySimpleDetailRET"  
+      @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler"
+      v-if="pageType=='PropertySimpleDetailRET'" @closeSideHandler="closeSideHandler"></ct-PropertySimpleDetailRET>
     </div>
 </template>
 
@@ -22,6 +24,8 @@
       api: String,
       apiParam: Object,
       pageType: String,
+      selectIndex:Number,
+      rowCount:Number,
     },
     data() {
       return {
@@ -32,6 +36,15 @@
       this.model = this.vmodel;
     },
     methods: {
+      closeSideHandler() {
+        this.$emit('closeSideHandler');
+      },
+      clickNextHandler() {
+        this.$emit('clickNextHandler');
+      },
+      clickPrevHandler() {
+        this.$emit('clickPrevHandler');
+      },
     }
   }
 </script>

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -1,14 +1,53 @@
 <template>
-    <div ref="main" class="main">
-      <div style="height:36px;margin-top: 10px;display: flex;">        
-        <img src="../../../assets/ewmA.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:22px">
-        <span :style="{'width':computedTopWidth}"></span>
-        <img src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-right:11px">
-        <img src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-right:8px">
-        <div class="el-icon-close"></div>
+    <div ref="main" class="main" v-if="model!==null">
+      <div style="height:36px;margin-top: 10px;display: flex;border-bottom: solid 2px #EE6B6B;">        
+        <img src="../../../assets/ewmA.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:22px;cursor: pointer">
+        <div :style="{'width':topWidth+'px'}" style="font-size: 14px;color: #333333;padding-left: 10px;line-height: 26px;">
+          <span>{{model.fields1Dic.PropertyNo.label}}</span>
+          <span>{{model.fields1Dic.PropertyNo.value}}</span>
+        </div>
+        <img :class="{'domDisabled':selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt="" 
+        style="width: 26px;height: 26px;vertical-align: bottom;margin-right:11px;cursor: pointer">
+        <img :class="{'domDisabled':selectIndex===rowCount-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" 
+        style="width: 26px;height: 26px;vertical-align: bottom;margin-right:8px;cursor: pointer">
+        <div class="el-icon-close cursor" style="padding-top: 5px;" @click="closeSideHandler"></div>
       </div>
-      <div v-if="model!==null">
-        11111111111111111111111
+      <div style="padding-left: 20px;padding-right: 20px;">
+        <div style="margin-top: 18px;">
+          <div style="font-weight: Bold;font-size: 16px;color: #333333;">
+            <span>{{model.fields1Dic.EstateName.value}}</span>
+            <span>{{model.fields1Dic.BuildingName.value}}</span>
+            <span>{{model.fields1Dic.RoomNo.value}}</span>
+            <div style="float:right;border: 1px solid #E0E0E0;font-size: 12px;color: #333333;padding-top: 3px;
+            width: 68px;height: 26px;border-radius: 6px;text-align: center;">
+              {{model.fields1Dic.StatusName.value}}
+            </div>
+          </div>
+          <div style="font-size: 12px;color: #999999;margin-top: 7px;">
+            <span>{{model.fields1Dic.DistrictName.value}}</span>
+            <span>{{model.fields1Dic.AreaName.value}}</span>
+          </div>
+          <div style="margin-top: 7px;display: flex;">
+            <div v-for="(tag, index) in model.actionRouterLabel" :key="index" class="t-tag"
+            :style="{color:tag.textColor,backgroundColor:tag.bgColor,borderColor:tag.borderColor}">
+            {{tag.label}}
+            </div>
+          </div>
+        </div>
+        <div style="display: flex;margin-top: 16px;height: 65px;border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;text-align: center;">
+          <div style="width: 33.33%;">
+            <div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.AreaNet.label}}</div>
+            <div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;">{{model.fields1Dic.AreaNet.value}}{{model.fields1Dic.AreaNet.unitName}}</div>
+          </div>
+          <div style="width: 33.33%;">
+            <div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.Price.label}}</div>
+            <div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;">{{model.fields1Dic.Price.value}}{{model.fields1Dic.Price.unitName}}</div>
+          </div>
+          <div style="width: 33.33%;">
+            <div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.FloorName.label}}</div>
+            <div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;">{{model.fields1Dic.FloorName.value}}</div>
+          </div>
+        </div>
       </div>
     </div>
 </template>
@@ -24,18 +63,14 @@
       vmodel: Object,
       api: String,
       apiParam: Object,
+      selectIndex:Number,
+      rowCount:Number,
     },
-    computed: {
-      computedTopWidth(){
-        // debugger
-        // let w=this.$refs.main.clientWidth;
-        // let wt=w-140;
-        return 300+'px';
-      }
+    computed: {      
     },
     data() {
       return {
-        
+        topWidth:300,
       }
     },
     mounted() {
@@ -54,7 +89,7 @@
     },
     activated() {
       this.$nextTick(() => {
-        this.setDetailHeight();
+        this.setDetailStyle();
       })
     },
     methods: {
@@ -67,14 +102,20 @@
           this.model.getTags2List(0);
         }
         this.loadOperation();
-        this.loadCommission();
-        this.setDetailHeight();
+        this.setDetailStyle();
         this.$nextTick(() => {
           window.addEventListener("resize", (ev) => {
-            self.setDetailHeight();
+            self.setDetailStyle();
           });
         });
       },
+      setDetailStyle() {
+        this.$nextTick(() => {
+          if(this.$refs.main){
+            this.topWidth=this.$refs.main.clientWidth-140;
+          }
+        });
+      }, 
       loadFields() {
         var self = this;
         self.collapse=[];
@@ -121,9 +162,6 @@
         this.model._operationRouters=[];
         this.model.getOperationList();
       },
-      loadCommission() {
-        this.model.getCommissionList();
-      },
       lookOwner() {
         this.codeOwner = true
       },
@@ -133,13 +171,6 @@
           this.model.getTags2List(i);
         }
       },
-      setDetailHeight() {
-        this.$nextTick(() => {
-          if (this.$refs.detail && this.$refs.main) {
-            
-          }
-        });
-      }, 
       handleSelect(key, keyPath) {
         let i=key.index;
         this.model.activeIndex1=i;
@@ -306,11 +337,32 @@
           clickAcion(field,submitData);
         }
       },
+      closeSideHandler() {
+        this.$emit('closeSideHandler');
+      },
+      setBtnHandler(index,count) {
+        this.selectIndex=index;
+        this.count=count;
+      },
+      clickNextHandler() {
+        this.$emit('clickNextHandler');
+      },
+      clickPrevHandler() {
+        this.$emit('clickPrevHandler');
+      },
     }
   }
 </script>
 <style lang="scss" scoped>
-
+.t-tag {
+    color: #999;
+    background: #f3f3f3;
+    border: 1px solid #d8d8d8;
+    padding: 2px 9px;
+    border-radius: 3px;
+    margin-right: 10px;
+    font-size: 12px;
+}
 </style>
 
 

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

@@ -14,13 +14,17 @@
 
       <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" @loaded="tableLoaded"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
+      @rowClickHandle="rowClickHandle"
       @showTitle="showTitleHandler"></ct-searchtable>
     </div>
     <div v-if="flagSideBar && flagSideBarOfData" 
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
     class="sidebar">
-      <ct-Detail :api="sideBarApi" :apiParam="sideBarApiParam" :pageType="sideBarPageType"></ct-Detail>
-      <ct-SearchSideMenu :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus" 
+      <ct-Detail ref="detail" :api="sideBarApi" :apiParam="sideBarApiParam" :pageType="sideBarPageType" 
+      :selectIndex="selectIndex" :rowCount="rowCount" :key="detailKey" 
+      @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler"
+      @closeSideHandler="closeSideHandler"></ct-Detail>
+      <ct-SearchSideMenu ref="sideMenu" :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus" 
       @sideMenuClickHandler="sideMenuClickHandler"></ct-SearchSideMenu>
     </div>
   </div>
@@ -32,7 +36,6 @@
   import dynamicSearchTable from './dynamicSearchTable.vue';
   import dynamicSearchSideMenu from './dynamicSearchSideMenu.vue';
   import progress from '../../progress/src/progress.vue';
-  import dynamicDetail from '../../dynamicDetail/src/dynamicDetail.vue';
   export default {
     name: 'ct-searchlist',
     mixins: [dynamicElement],
@@ -42,7 +45,7 @@
       'ct-progress': progress,
       'ct-searchcategory': dynamicSearchCategory,
       'ct-SearchSideMenu': dynamicSearchSideMenu,
-      'ct-Detail': dynamicDetail,
+      'ct-Detail': ()=>import('../../dynamicDetail/src/dynamicDetail.vue'),
     },
     props: {
       vmodel: Object,
@@ -97,6 +100,9 @@
         sideBarApi:'',
         sideBarApiParam:null,
         sideBarPageType:'',
+        selectIndex:-1,
+        rowCount:0,
+        detailKey:0,
       }
     },
     methods: {
@@ -193,6 +199,19 @@
           }
         }
       },
+      rowClickHandle() {
+        var self = this;
+        if(self.selectIndex!==self.$refs.table.model.selectIndex){
+          self.selectIndex=self.$refs.table.model.selectIndex;
+          self.rowCount=self.$refs.table.model.listData.length;
+          self.sideBarApiParam = {};
+          self.$refs.table.model.rowSelectRouter.submitListField.forEach((k) => {
+            self.sideBarApiParam[k] = self.$refs.table.model.listData[self.selectIndex][k];
+          });
+          self.sideBarApiParam.actionType = self.$refs.table.model.rowSelectRouter.actionType;
+          self.detailKey = self.detailKey+1;
+        }
+      },
       sideMenuClickHandler(v) {
         if(v=='open'){
           this.sideBarStatus ='close';
@@ -207,8 +226,18 @@
           this.sideBarWidth=this.$refs.table.model.sideBarWidth;
           this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
           this.sideBarMenuRight=this.sideBarWidth-2;
+          this.rowClickHandle();
         }
       },
+      closeSideHandler() {
+        this.$refs.sideMenu.clickHandler();
+      },
+      clickNextHandler() {
+        this.$refs.table.rowKeyDownHandle(null,1);
+      },
+      clickPrevHandler() {
+        this.$refs.table.rowKeyDownHandle(null,-1);
+      },
     }
   }
 </script>

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

@@ -80,7 +80,6 @@
                   :rowspan="tdRowspan(column, row)"
                   class="ct-td"
                   :class="[colHasWidth[colIndex],model.tdClass,
-                  column.router?'cursor':null,
                   colIndex === leftShadow?'shadowLeft':null,
                   colIndex === rightShadow?'shadowRight':null,
                   column.fixed === 'left'?'left-fixation':null,
@@ -558,6 +557,7 @@
       rowClickHandle(ev, index) {
         this.model.selectIndex = index;
         this.rowColorChange();
+        this.$emit('rowClickHandle');
         ev.cancelBubble = true;
         ev.stopPropagation();
       },
@@ -597,6 +597,7 @@
         }
         this.rowColorChange();
         this.resetScroll();
+        this.$emit('rowClickHandle');
         if (!this.isBusy) {
           if (this.model.selectIndex === this.model.listData.length - 1) {
             self.isBusy = true;
@@ -614,9 +615,11 @@
             });
           }
         }
-        ev.cancelBubble = true;
-        ev.stopPropagation();
-        ev.preventDefault();
+        if(ev){
+          ev.cancelBubble = true;
+          ev.stopPropagation();
+          ev.preventDefault();
+        }
       },
       searchComplate(m, defaultSearch) {
         var self = this;

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

@@ -0,0 +1,59 @@
+import base from '../../index';
+import Base from './Base';
+import LibFunction from './lib/LibFunction';
+import common from '../../../common/index';
+import Router from './Router';
+import Enum from './lib/Enum';
+import Vue from 'vue';
+
+const Compound = function (source, dateType) {
+  var rtn = {
+    get label() {
+      let l = '';
+      if (source.controlLabel) {
+        l = source.controlLabel;
+      }
+      if (source.labelDelimiter) {
+        l = l + source.labelDelimiter;
+      }
+      return l;
+    },
+    set label(v) {
+      source.controlLabel = v;
+    },
+    getFormObj() {
+      var rtnFormObj = {};
+      rtn.fields.forEach((f) => {
+        if (typeof f.id !== 'undefined') {
+          Object.assign(rtnFormObj, f.getFormObj());
+        }
+      });
+      return rtnFormObj;
+    },
+    _fields: null,//数组，方便遍历 
+    get fields() {
+      if (rtn._fields !== null) {
+        return rtn._fields;
+      }
+      let Index = 0;
+      rtn._fields = [];
+      for (var key in source.compoundFields) {
+        let value = source.compoundFields[key];
+        Index++;
+        let showLabel = true;
+        let item = LibFunction.GetControl(value, source, showLabel, false);
+        if (item instanceof Object) {
+          item.form = rtn;
+          if (Index == 1 && item.label == "") {
+            item.label = rtn.label;
+          }
+          rtn._fields.push(item);
+        }
+      }
+      return rtn._fields;
+    },
+  };
+  rtn = base.copy(Base(source), rtn);
+  return rtn;
+};
+export default Compound;

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -229,6 +229,10 @@ const Enum = {
     /// 重复控件
     /// </summary>
     Repeat: 47,
+    /// <summary>
+    /// 复合控件
+    /// </summary>
+    Compound: 48,
   },
 
   //返回状态码

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -33,6 +33,7 @@ import SensitiveEye from '../SensitiveEye';
 import Cb from '../Cb';
 import PhotoSelect from '../PhotoSelect';
 import Repeat from '../Repeat';
+import Compound from '../Compound';
 
 const LibFunction = {
   install(Vue) {
@@ -218,6 +219,10 @@ const LibFunction = {
         item = Repeat(listobj, field);
         item.is = 'ct-repeat';
         break;
+      case Enum.ControlType.Compound://复合
+        item = Compound(field);
+        item.is = 'ct-compound';
+        break;
       case Enum.ControlType.Hidden://隐藏控件
         item = Hd(field);
         break;

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

@@ -39,6 +39,7 @@ const loader = {
   QuickInputSos: require("./ctl/QuickInputSos.js").default,
   ContactList: require("./ctl/ContactList.js").default,
   Repeat: require("./ctl/Repeat.js").default,
+  Compound: require("./ctl/Compound.js").default,
 };
 
 export default loader;

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -1,7 +1,7 @@
 <template>
-  <div :class="isOperationalColumn?'subdiv_allinline':''" v-if="isShowLabel" @click="clickHandler($event)">
-    <img v-if="router.imgUrl && isShowImg" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="router.label" />
-    <a v-else href="javascript:void(0);" class="ct-tablecurrencyItem" >
+  <div :class="isOperationalColumn?'subdiv_allinline':''" v-if="isShowLabel" @click="isOperationalColumn?clickHandler($event):null">
+    <img v-if="router.imgUrl && isShowImg" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="router.label"  @click="!isOperationalColumn?clickHandler($event):null"/>
+    <a v-else href="javascript:void(0);" class="ct-tablecurrencyItem"  @click="!isOperationalColumn?clickHandler($event):null">
       {{label}}
     </a>
   </div>