centaline-data-driven 1.2.11 → 1.2.12

package/package.json

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

package/src/Detail.vue

@@ -7,7 +7,7 @@
 
 <script>
   export default {
-    name: 'App',
+    name: 'DataDrivendetail',
     data() {
       return {        
         apiParam: {actionType: 1,chanceID: "2"} ,

package/src/Form.vue

@@ -8,7 +8,7 @@
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <!-- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'Worklist/getLayoutOfMyApply'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'PropertyRealLook/getLayoutOfNew'" :apiParam="para"></ct-form>
     <!-- <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -25,7 +25,7 @@
         // apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
         // apiParam: {chanceID: "1", actionType: 2} ,
         // apiParam: {worklistID: "1494206747714392064", actionType: 2}
-        apiParam: {instanceID: "1495923412655280128", actionType: 3}
+        para: {chanceID: "1", actionType: 2}
         // apiParam: {
         //   actionType: 2,
         //   agentId: "1450283160825425922",

package/src/centaline/common/index.js

@@ -294,6 +294,9 @@ const common = {
       else if (parent.$options.name === 'DataDrivenForm') {
         return parent;
       }
+      else if (parent.$options.name === 'DataDrivendetail') {
+        return parent;
+      }
       else {
         return this.getParentPane(parent);
       }

package/src/centaline/css/common.css

@@ -720,6 +720,12 @@ html {
 .ct-right-10{
   right: 10px !important;
 }
+.unitName-0{
+  margin-right: 0px !important;
+}
+.unitName-20{
+  margin-right: 23px !important;
+}
 .ct-table-content{
   padding: 0;
 }

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

@@ -185,7 +185,7 @@
                     :index="index.toString()" :name="index.toString()" :label="col.appName"></el-tab-pane>
                   </el-tabs>
                   <ct-searchlist v-if="model.searchConditionApiTags1" :key="model.searchlistKey"
-                  :apiParam="model.paramDataTags1"
+                  :apiParam="model.paramDataTags1" :flagFocus="false"
                   :searchConditionApi="model.searchConditionApiTags1" 
                   :searchDataApi="model.searchDataApiTags1"></ct-searchlist>
                 </div>
@@ -257,89 +257,16 @@
                   </el-tab-pane>
                 </el-tabs>
               </div>
-              <!-- <div class="operation-list p0">
-                  <button data-v-6fe32525="" type="button" class="el-button list-item base-box el-button--default">编辑房源</button>
-                  <button data-v-6fe32525="" type="button" class="el-button list-item base-box el-button--default">转潜盘</button>
-                  <button data-v-6fe32525="" type="button" class="el-button list-item base-box el-button--default">激活房源</button>
-              </div> -->
-              <div class="operation-table base-box">
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">住建委卖委托</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>新增委托</span></button></div>
-                  </div>
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">独家委托</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>新增委托</span></button></div>
-                  </div>
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">普通委托</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>新增委托</span></button></div>
-                  </div>
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">踩盘</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>踩盘</span></button></div>
-                  </div>
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">普通实勘</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>新增实勘</span></button></div>
-                  </div>
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">VR实勘</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>VR预约</span></button></div>
-                  </div>
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">钥匙</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>新增钥匙</span></button></div>
-                  </div>
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">发布房源</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>发布</span></button></div>
+              <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
+                <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
+                  <div class="t-item">
+                    <span class="i">{{col.operationName}}</span>
                   </div>
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">经理推荐</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>推荐</span></button></div>
-                  </div>
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">总房源</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>推荐</span></button></div>
-                  </div>
-                  <div class="table-box">
-                    <div class="t-item">
-                      <span class="i">推广资料</span>
-                    </div>
-                    <div class="t-item"><span class="i">无委托</span></div>
-                    <div class="t-item"><button type="button" class="el-button t-but el-button--info max-info"><span>新增</span></button></div>
+                  <div class="t-item"><span class="i">{{col.desc}}</span></div>
+                  <div class="t-item" style="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>                  
               </div>
               <div class="customer">
                   <div class="customer-title">
@@ -523,6 +450,7 @@
         if(this.model.tags2 && this.model.tags2[0]){
           this.model.getTags2List(0);
         }
+        this.loadOperation();
         this.setDetailHeight();
         this.$nextTick(() => {
           window.addEventListener("resize", (ev) => {
@@ -571,6 +499,12 @@
           }
         });
       },
+      loadOperation() {
+        this.model._operationList=null;        
+        this.model._operationRouters=[];
+        this.model.operationKey=this.model.operationKey+1;
+        this.model.getOperationList();
+      },
       lookOwner() {
         this.codeOwner = true
       },
@@ -586,10 +520,9 @@
       setDetailHeight() {
         this.$nextTick(() => {
           if (this.$refs.detail && this.$refs.main) {
-            var h1 = document.documentElement.clientHeight | 0;
-            var h2 = this.$refs.main.parentElement.offsetTop | 0;
-            var h3 = this.$refs.detail.offsetTop | 0;
-            let detailHeight = h1 - h3 - 65;
+            var h1 = this.$common.getParentPane(this).$el.offsetHeight | 0;
+            var h2 = this.$refs.detail.offsetTop | 0;
+            let detailHeight = h1 - h2;
             this.model.detailHeight = detailHeight < 40 ? 350 : detailHeight;
           }
         });
@@ -606,6 +539,7 @@
       },      
       fieldClickHandler(field) {
         var self = this;
+        var callBack=null;
         let submitData={};
         var router = this.model.actionRouters.find((v) => {
           return v.id === field.id;
@@ -616,9 +550,15 @@
           });
         }
         if(router==undefined){
-          router = this.model.otherTradeActionRouter.find((v) => {
-            return v.id === field.id;
-          });
+          if(field.id===this.model.otherTradeActionRouter.id){
+            router = this.model.otherTradeActionRouter
+          }
+        }
+        if(router==undefined){
+            router = this.model.operationRouters.find((v) => {
+              return v.id === field.id;
+            });
+            callBack="loadOperation";
         }
 
         if(router){
@@ -634,9 +574,14 @@
           }
         }
 
-        this.routerClickHandler(router,submitData);
+        if(callBack && callBack=='loadOperation'){
+          this.routerClickHandler(router,submitData,self.loadOperation);  
+        }
+        else{
+          this.routerClickHandler(router,submitData);
+        }
       },
-      routerClickHandler(field, submitData) {
+      routerClickHandler(field, submitData,callBack) {
         var self = this;
         // this.model.scripts.$fd = field.id;
         // this.model.scripts.$result = [];
@@ -664,6 +609,9 @@
                   on: {
                     submit(ev) {
                       self.model.doAction(ev,field);
+                      if(callBack){
+                        callBack();
+                      }
                       self.$common.closeDialog(dialogOption.dialog);
                     }
                   }
@@ -707,6 +655,9 @@
               let query = self.$common.objectToQueryStr(submitData);
               window.open(field.action + query, "_blank");
             }
+            else{
+              
+            }
           }
           //执行客户端脚本
           else {

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

@@ -20,7 +20,7 @@
             </span>
        </span>
 
-          <span v-if="model.unitName" class="ct-unitname el-input__suffix el-input__suffix-inner">{{model.unitName}}</span>
+          <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">

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

@@ -18,7 +18,7 @@
     </div>
     <div class="ct-tableParent" ref="tableParent" v-bind="model.attrs" v-if="!isLoading"
          :style="{'height':model.tableHeight+'px'}"
-         @scroll="scrollHandle($event)" v-focus="true"
+         @scroll="scrollHandle($event)" :v-focus="model.flagFocus"
          @keydown.up="rowKeyDownHandle($event,0)" @keydown.down="rowKeyDownHandle($event,1)"
          tabindex="-1">
       <div class="ct-table-content">
@@ -157,7 +157,11 @@
     props: {
       vmodel: Object,
       api: String,
-      searchStatsApi: String
+      searchStatsApi: String,
+      flagFocus:{
+        Boolean,
+        default:true
+      }
     },
     computed: {
        headAllCheckClass() {
@@ -211,13 +215,10 @@
     },
     methods: {
       rowCheckClass(row) {
-
-         if(row.$select)
-         {
+         if(row.$select){
            return 'is-checked';
          }
-
-       },
+      },
       load(data) {
         var self = this;
         self.model = data;

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

@@ -9,7 +9,7 @@
                 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"
                 @keyup.enter.native="search()">
-        <span slot="suffix" v-if="model.unitName" class="ct-unitname">{{model.unitName}}</span>
+        <span slot="suffix" v-if="model.unitName" class="ct-unitname" :class="showClear?'unitName-20':'unitName-0'">{{model.unitName}}</span>
 
         <span slot="suffix" class="el-input__suffix el-input--mini" v-if="!model.isPassword&&showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
           <span class="el-input__suffix-inner ct-close">

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -4,10 +4,21 @@
       <el-aside :width="leftWidth?leftWidth+'px':'15%'" style="background-color:white">
         <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" @loaded="loaded"></ct-searchtree>
       </el-aside>
-      <el-main v-if="isShowSearchlist">
-        <div style="height: calc(100vh - 100px);">
-          <ct-searchlist :searchConditionApi="searchTableConditionApi" :searchDataApi="searchTableDataApi" :api-param="apiParam"></ct-searchlist>
-        </div>
+      <el-main v-if="isShowMain">
+
+        <template v-if="pageType=='form'">
+          <div style="height: calc(100vh - 120px);">
+            <div style="border:1px solid red" :style="{'width':(width?width+'px':'auto'),'height':(height?height+'px':'auto')}">
+              <ct-form :api="formApi" :api-param="apiParam" :width="width" :height="height"></ct-form>
+            </div>
+          </div>
+        </template>
+        <template v-else>
+          <div style="height: calc(100vh - 100px);">
+            <ct-searchlist :searchConditionApi="searchTableConditionApi" :searchDataApi="searchTableDataApi" :api-param="apiParam"></ct-searchlist>
+          </div>
+        </template>
+
       </el-main>
     </el-container>
   </div>
@@ -17,12 +28,13 @@
   import dynamicElement from '../../mixins/dynamicElement'
   import dynamicSearchTree from './dynamicSearchTree.vue';
   import dynamicSearchList from '../../dynamicSearchList/src/dynamicSearchList.vue';
+  import dynamicForm from '../../dynamicForm/src/dynamicForm';
   export default {
     name: 'ct-treelist',
     mixins: [dynamicElement],
     components: {
       'ct-searchtree': dynamicSearchTree,
-      'ct-searchlist': dynamicSearchList
+      'ct-form': dynamicForm,
     },
     props: {
       vmodel: Object,
@@ -34,25 +46,40 @@
       return {
         searchTableConditionApi: "",
         searchTableDataApi: "",
-        isShowSearchlist: false,
+        formApi: "",
+        width: 0,
+        height: 0,
+        isShowMain: false,
+        pageType: 'list',
         apiParam: {}
       };
     },
     methods: {
       loaded(data) {
         var self = this;
-        self.isShowSearchlist = false;
-        if (data && data.rowRouter) {
+        self.isShowMain = false;
+        self.pageType = "list";
+        if (data && data.rowRouter && (JSON.stringify(data.rowRouter) != "{}")) {
+          self.formApi = data.rowRouter.getLayout;
+          self.pageType = data.rowRouter.pageType != undefined ? data.rowRouter.pageType : "list";
+          self.width = parseFloat(data.rowRouter.width != undefined ? data.rowRouter.width : "0");
+          self.height = parseFloat(data.rowRouter.height != undefined ? data.rowRouter.height : "0");
           self.searchTableConditionApi = data.rowRouter.getLayoutOfSearch;
           self.searchTableDataApi = data.rowRouter.getList;
           var defaultPara = self.$common.deepClone(data);
           delete defaultPara.rowRouter;
           delete defaultPara.getLayoutOfSearch;
           delete defaultPara.getList;
+          delete defaultPara.getLayout;
+          delete defaultPara.width;
+          delete defaultPara.height;
 
           self.apiParam = defaultPara;
           self.$nextTick(() => {
-            self.isShowSearchlist = true;
+            if (self.searchTableConditionApi || self.searchTableDataApi || self.formApi) {
+              self.isShowMain = true;
+            }
+           
           });
         }
       },

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

@@ -18,10 +18,14 @@ const Detail = function (source,para ,callBack) {
         activeIndex1:'0',
         activeIndex2:'0',
         searchlistKey:0,      
-        tags2Key:0,
+        tags2Key:0,    
+        operationKey:0,
         _searchConditionApiTags1:null,
         _searchDataApiTags1:null,
-        _paramDataTags1:null,  
+        _paramDataTags1:null,
+        _operationApiRouter:null,
+        _operationList:null,
+        _operationRouters:[],
         get fields1() {
             return data.fields1;
         },
@@ -244,22 +248,44 @@ const Detail = function (source,para ,callBack) {
             return rtn._operationApiRouter;
           }
         },
-        getOperationList(i){
-            if(rtn.operationApiRouter){
-                let action =rtn.operationApiRouter.action;
-                let para={};
-                rtn.operationApiRouter.submitFormField.forEach((v) => {
-                  para[v] = rtn.fields1Dic[v].value;
-                });
-                Vue.prototype.$api.postHandler(common.globalUri(), { action: action,para:para}).then(
-                    function (response) {
-                        if (response.rtnCode === Enum.ReturnCode.Successful) {
-                            rtn.tags2[i].list=response.content;
-                            rtn.tags2Key= rtn.tags2Key+1;
-                        }
+        get operationList() {          
+          return rtn._operationList;
+        },
+        get operationRouters() {          
+          return rtn._operationRouters;
+        },
+        getOperationList(){
+          if (rtn._operationList !==null){
+            return rtn._operationList;
+          }
+          else if(rtn.operationApiRouter){
+            let action =rtn.operationApiRouter.action;
+            let para={};
+            rtn.operationApiRouter.submitFormField.forEach((v) => {
+              para[v] = rtn.fields1Dic[v].value;
+            });
+            Vue.prototype.$api.postHandler(common.globalUri(), { action: action,para:para}).then(
+                function (response) {
+                    if (response.rtnCode === Enum.ReturnCode.Successful) {
+                      rtn._operationList=response.content;
+                      if(rtn._operationList && rtn._operationList.length>0){
+                        rtn._operationList.forEach((v,i) => {
+                          if (v.modelRouter) {                
+                            var router = Router(v.modelRouter);
+                            router.is = "ct-btn";
+                            router.attrs = { size: "mini" }
+                            if(router.rightField){
+                              router.show=v[router.rightField];
+                            } 
+                            rtn._operationList[i].router=router;
+                            rtn._operationRouters.push(router)
+                          }
+                        });
+                      }
                     }
-                );
-            }
+                }
+            );
+          }
         },
         doAction(response,field) {
           if (response.responseData) {
@@ -269,9 +295,14 @@ const Detail = function (source,para ,callBack) {
           || field.id=='Trust'
           || field.id=='RealLook'
           || field.id=='StatusAdjust'
+          || field.id=='OperationKey'
           || field.id=='Key'){
+            let id=field.id;
+            if(field.id=='OperationKey'){
+              id='Key';
+            }
             var advIndex = rtn.tags1.findIndex((v) => {
-              return v.appID === field.id;
+              return v.appID === id;
             });
             rtn.$vue.handleSelect({index:advIndex.toString()});
           }

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

@@ -3,10 +3,6 @@ import Base from './Base';
 import valid from '../../../validate/index';
 const T = function (source, inputType, readonly, isPassword) {
   var rtn = {
-
-    // attrs: {
-    //   clearable: true,
-    // },
     get clearable() {
       if (typeof source.clear === 'undefined'&&!readonly&&!source.locked) {
         return true;