centaline-data-driven 1.2.20 → 1.2.23

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

@@ -135,52 +135,11 @@
                   </div>
               </div>
               <div class="open-mero" @click="allInfo=!allInfo">{{allInfo?'收起全部':'查看全部'}}
-                <!-- <img src="../../../assets/mero.png" alt="" class="mero" >  :class="allInfo?'more-colose':'more-open'" -->
                 <i :class="allInfo?'more-colose':'mero-open'"></i>
               </div>
             </div>
             <div class="contacts-info base-box">
-              <!-- 联系人 -->
-              <div class="contacts-head">
-                    <div class="title-l">联系人信息</div>
-                    <button type="button"  v-if="!codeOwner"  @click="lookOwner" class="el-button contacts-but el-button--info el-button--mini max-info">查看业主</button>
-                    <div class="contacts-tips" v-else>
-                      <button class="el-button el-button--primary el-button--mini max-btn-add">新增联系人</button>
-                      <button class="el-button el-button--primary el-button--mini max-btn-add">通话记录</button>
-                      <button class="el-button el-button--primary el-button--mini max-btn-add">查看历史号码</button>
-                    </div>
-
-              </div>
-              <!-- 表格 -->
-              <div class="contacts-table" v-show="codeOwner">
-                  <el-table
-                     :data="tableData"
-                      stripe
-                      fit
-                      style="width: 100%"
-                      :header-cell-style="{background:'#f3f3f3',color:'#333333'}">
-                   <el-table-column
-                  v-for="(item,index) in columnList"
-                  :key="index"
-                  :property="item.prop"
-                  :label="item.label"
-                  :min-width="item.width"
-                >
-                  <template slot-scope="scope">
-                    <span v-if="scope.column.property=='phone'">{{ scope.row.phone }}
-                      
-                    </span>
-                    <span v-else-if="scope.column.property=='tel'">
-                      {{scope.row.tel}}
-                     
-                    </span>
-                    <span v-else>
-                      {{scope.row[scope.column.property]}}
-                    </span>
-                  </template>
-                </el-table-column>
-                  </el-table>
-              </div>
+              <ct-contactList v-if="model.contactApiRouter!==null" :apiRouter="model.contactApiRouter" ></ct-contactList>
             </div>
             <div class="tablist-info base-box">
                 <div class="details-tabs-box">
@@ -346,11 +305,13 @@
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
   import dynamicSearchList from '../../dynamicSearchList/src/dynamicSearchList.vue';
+  import dynamicContactList from './dynamicContactList.vue';
   export default {
     name: 'ct-PropertyDetailRET',
     mixins: [dynamicElement],
     components: {
       'ct-searchlist': dynamicSearchList,
+      'ct-contactList': dynamicContactList,
     },
     props: {
       vmodel: Object,
@@ -365,66 +326,10 @@
           { name: '餐厅', url: 'http://10.5.10.44:13031/Images/20210705/112124_4f83c6d5-36bd-444f-9ea1-fa4e3f4de5e0.jpg?width=140&height=135&mode=stretch', isVr: false, type: 'img' },
           { name: '户型图', url: 'http://10.5.10.44:13031/Images/20210705/112505_6a3cb2d4-c773-4aba-91af-df6721eadb34.jpg?width=140&height=135&mode=stretch', isVr: false, type: 'video' },
           { name: '其它', url: 'http://10.5.10.44:13031/Images/20210705/112133_b62d7a78-96b3-4801-b94c-47b83263a001.jpg?width=140&height=135&mode=stretch', isVr: false, type: 'video' },
-        ],},
-        allInfo: false,
-        allIn:false,
-        codeOwner: false,
-        columnList: [
-        {
-          prop: 'name',
-          label: '联系人',
-          width: '80'
-        },
-        {
-          prop: 'type',
-          label: '类型',
-          width: '60'
-        },
-        {
-          prop: 'phone',
-          label: '手机',
-          width: '125'
+          ],
         },
-        {
-          prop: 'tel',
-          label: '座机',
-          width: '170'
-        },
-        {
-          prop: 'wx',
-          label: '微信',
-          width: '150'
-        },
-        {
-          prop: 'entTime',
-          label: '录入时间',
-          width: '150'
-        },
-        {
-          prop: 'entUser',
-          label: '录入人',
-          width: '80'
-        },
-        {
-          prop: 'remarks',
-          label: '操作',
-          // width:'180'
-        },
-        ],
-        tableData: [
-          {
-            name: '王建国先生',
-            type: '业主',
-            phone: '13866668888',
-            tel: '0275-55556666-5896',
-            wx: '555566665896',
-            entTime: '2021-10-26 29:27:25',
-            entUser: '王天',
-            remarks: '删除',
-            isIcon: true,
-          },
-        ],
-        opening:'first',      
+        allInfo: false,
+        allIn:false, 
       }
     },
     mounted() {

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

@@ -3,8 +3,8 @@
     <div class="list-title">
       <h5>{{model.title}}</h5>
     </div>
-    <div class="list-button max-btn-add">
-      <el-button v-if="model.create" type="success" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+    <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>
@@ -349,7 +349,6 @@
   .ct-form-list .list-button {
     padding-bottom: 5px;
     text-align: right;
-    width: 45%;
     display: inline-table;
     float: right;
   }

package/src/centaline/dynamicPhotoSelect/src/dynamicPhotoSelect.vue

@@ -14,7 +14,7 @@
           <div class="cover-list-item">
             <el-image
               fit="fill"
-              :src="item.mediaUrl"
+              :src="item.thumbnailUrl"
               style="width: 100px; height: 100px"
               :z-index="previewZIndex"
               @click="viewerOpen(photoList, index)"
@@ -138,8 +138,8 @@ export default {
               Selected: chooseList,
               // width: self.modelPhotoselect.router.pageWidth + 'px',
               // height: self.modelPhotoselect.router.pageHeight+'px',
-              width: "1024px",
-              height: "600px",
+              width: "772px",
+              height: "550px",
               para: params,
             },
             on: {

package/src/centaline/dynamicPhotoSelectList/src/dynamicPhotoSelectList.vue

@@ -1,55 +1,43 @@
 <template>
-  <div style="width:100%" class="ct-photoSelectList" v-if="FlagPhoto">
-    <el-main style="position:absolute; top:60px;bottom:60PX;left:0;right:0;">
-      <el-row :gutter="10">
-        <el-col :span="24"
-                :lg="4"
-                :md="7"
-                :sm="9"
-                v-for="(item, index) in imageList"
-                :key="index">
-          <el-card class="box-card mb-3 position-relative" :class="{'border-danger': item.ischeck }"
-                   :body-style="{ padding: '0' }"
-                   shadow="hover"
-                   style="cursor:pointer;">
-            <div class="border ">
-              <img :src="item.mediaUrl"
-                   alt=""
-                   class="w-100"
-                   style="height:100px;" />
-              <div class="w-100 text-white px-1"
-                   style="background:rgba(0,0,0,0.5);margin-top:-25px; position:absolute">
-                <span class="small">{{item.mediaLabelName }}</span>
-              </div>
-              <div class="p-2 text-center">
-                <el-button-group>
-                  <el-button icon="el-icon-view"
-                             size="mini"
-                             class="p-2"
-                             @click="viewerOpen(imageList,index)"></el-button>
-                  <el-button icon="el-icon-shopping-cart-2"
-                             size="mini"
-                             class="p-2"
-                             @click="choose(item)"></el-button>
-                </el-button-group>
-                <span class="badge badge-danger"
-                      style="position:absolute;right:0;top:0;"
-                      v-if="item.ischeck"></span>
-                <!-- <el-tag type="danger" effect="dark" size="mini" >1</el-tag> -->
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-      </el-row>
-    </el-main>
+  <div style="    width: 100%;height: 100%;position: relative;
+" class="ct-photoSelectList" v-if="FlagPhoto">
+    <el-main style="position: absolute;
+    top: 10px;
+    bottom: 70PX;
+    left: 10px;
+    right: 0;
+    padding:0px">
+      <ul class="el-upload-list el-upload-list--picture-card">
+        <li class="el-upload-list__item is-success" :class="{'border-danger': item.ischeck}"
+            v-bind:key="index"
+            v-for="(item, index) in imageList">
+          <div class="cover-list-item">
+            <el-image fit="fill"
+                      :src="item.thumbnailUrl"
+                      style="width: 100px; height: 100px"
+                      :z-index="previewZIndex"
+                      @click="viewerOpen(imageList, index)">
+            </el-image> 
+            <span class="cover-list-item-span" v-if="item.mediaLabelName">
+              <span class="el-dropdown-link">
+                &nbsp;{{ item.mediaLabelName }}
+              </span>
+            </span>
+            <div class="p-2 text-center">
+              <i class="max-view" @click="viewerOpen(imageList,index)"></i>
+              <i class="max-success" @click="choose(item)" :class="{'ischeck': item.ischeck }"></i>
 
+              <!-- <el-tag type="danger" effect="dark" size="mini" >1</el-tag> -->
+            </div>
+          </div>
+        </li> 
+     </ul>
 
-    <el-row :gutter="10" t>
-      <el-col :span="24" :lg="4" :md="6" :sm="8">
-        <el-button type="primary" @click="handleClick()">选择</el-button>
-      </el-col>
-    </el-row>
+</el-main>
 
+    <div style="width:100%;text-align:center">
+      <el-button type="primary" style="position:absolute;bottom:30px;" @click="handleClick()">选择</el-button>
+    </div>
     <ct-viewer ref="photoSelectListViewer" />
 
   </div>
@@ -148,7 +136,11 @@
         item.ischeck = false;
       },
       handleClick() {
-        this.$emit('handlePhoto', this.chooseList);
+        if (this.chooseList && this.chooseList.length > 0) {
+          this.$emit('handlePhoto', this.chooseList);
+        } else {
+          self.$message.warning("请选择至少一张图片");
+        }
         
       },
       viewerOpen(list, index) {
@@ -165,6 +157,116 @@
 </script>
 <style> 
   .border-danger {
-    border: 1px solid red;
+    border: 1px solid red !important;
+  }
+  .ct-photoSelectList .cover-list-item-span {
+    position: inherit;
+    bottom: 0px;
+    display: block;
+    background-color: #544f48;
+    opacity: 0.8;
+    text-align: left
+  }
+  .ct-photoSelectList .el-dropdown-link {
+    color: #fff;
+    margin-left:5px
+  }
+  .text-center {
+    position: absolute;
+    top: 0;
+    right: 5px;
+  }
+  .max-view {
+    background: url(../../../assets/ck.png);
+    background-size: 100% 100%;
+    width: 24px;
+    height: 24px;
+    display: inline-block;
+  }
+    .max-success {
+    background: url(../../../assets/succe.png);
+    background-size: 100% 100%;
+    width: 24px;
+    height: 24px;
+    display: inline-block;
+  }
+  .ischeck {
+     background: url(../../../assets/success.png);
+     background-size: 100% 100%;
+  }
+
+
+  .ct-upload-display-none .el-upload--picture-card {
+    display: none;
+  }
+
+  .el-upload-list__item .is-ready {
+    width: 100px;
+    height: 100px;
+  }
+
+  .ct-photoSelectList .cover-list-item {
+    position: sticky;
+  }
+
+  .ct-photoSelectList .cover-list-item-span {
+    position: inherit;
+    bottom: 0px;
+    left: 0px;
+    display: block;
+    background-color: #544f48;
+    opacity: 0.8;
+  }
+
+  .ct-photoSelectList .cover-list-item-span-delete {
+    position: inherit;
+    bottom: 160px;
+    left: 130px;
+    color: #000000;
+    text-align: center;
+  }
+
+  .cover-list-item-span-delete i {
+    cursor: pointer;
+    vertical-align: sub;
+    margin-right: 4px;
+  }
+
+  .ct-photoSelectList .el-dropdown-link {
+    cursor: pointer;
+    color: #fff;
   }
+
+  .ct-photoSelectList .el-icon-arrow-down {
+    font-size: 12px;
+  }
+
+  .el-collapse-item__content {
+    padding-bottom: 18px;
+  }
+
+  .el-upload--picture-card {
+    width: 100px;
+    height: 100px;
+    line-height: initial;
+    padding: 34px;
+  }
+
+    .el-upload--picture-card i {
+      font-size: 30px;
+    }
+
+  .el-upload-list--picture-card .el-upload-list__item {
+    width: 100px;
+    height: 100px;
+  }
+
+  .card {
+    display: inline-block;
+  }
+  .ct-photoSelectList .icon{
+cursor: pointer;
+    font-size: 20px;
+  }
+
 </style>

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

@@ -719,13 +719,13 @@
                     },
                     on: {
                       submit(ev) {
-                        if (!field.flagFreshCurrentRow) {
+                        if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
                           self.model.doAction(ev);
                         }
                         self.$forceUpdate();
                         self.$refs.footer.$forceUpdate();
                         self.$common.closeDialog(dialogOption.dialog);
-                        self.updateCurrentRow(field);
+                        self.updateCurrentRow(field,ev);
                       },
                       refreshParent() {
                         self.getPage(1);
@@ -790,12 +790,12 @@
                 self.operationLoading = true;
                 field.doAction(submitData, (data) => {
                   self.operationLoading = false;
-                  if (!field.flagFreshCurrentRow) {
+                  if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
                     self.model.doAction({ responseData: data });
                   }
                   self.$forceUpdate();
                   self.$refs.footer.$forceUpdate();
-                  self.updateCurrentRow(field);
+                  self.updateCurrentRow(field,data);
                 })
               }
             }
@@ -865,14 +865,14 @@
         //}
         //self.$refs
       },
-      updateCurrentRow(router) {
+      updateCurrentRow(router,data) {
         let self = this;
-        if (router.flagFreshCurrentRow) {
+        if (router.flagFreshCurrentRow || router.flagAddRowAfterAction) {
           self.tableComplate = true;
           self.model.getCurrentRowApiData(function () {
             self.$forceUpdate();
             self.tableComplate = false;
-          });
+          },data,router);
         }
       },
       importComplete(res) {

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

@@ -1,7 +1,7 @@
 <template>
   <div id="app-Tree" style="height:100%;">
     <el-container style="height:  calc(100vh - 98px);border: 1px solid #eee">
-      <el-aside :width="leftWidth?leftWidth+'px':'15%'" style="background-color:white">
+      <el-aside :width="leftWidth?leftWidth+'px':'15%'" style="background-color:white;border-radius: 6px;">
         <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" @loaded="loaded"></ct-searchtree>
       </el-aside>
       <el-main v-if="isShowMain">

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

@@ -0,0 +1,31 @@
+import base from '../../index';
+import Base from './Base';
+import Enum from './lib/Enum';
+import common from '../../../common';
+import Router from './Router';
+import Vue from 'vue';
+const ContactList = function (source,para ,callBack) {
+  var init = function (data) {
+    var rtn = {
+        $vue: null,
+        
+    };
+    return rtn;
+  }
+  if (typeof source === 'string') {
+    Vue.prototype.$api.postHandler(common.globalUri(), { action: source,para:para}).then(
+      function (response) {
+        if (response.rtnCode === Enum.ReturnCode.Successful) {
+          var rtn = init(response.content);
+          if (callBack) {
+            callBack(rtn);
+          }
+        }
+      }
+    );
+  }
+  else {
+    return init(source);
+  }
+}
+export default ContactList;

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

@@ -14,6 +14,7 @@ const Detail = function (source,para ,callBack) {
         _otherTradeActionRouter: null,//对应另外种交易的 router 如：本盘出售 则可能对应的出租的交易，没有则为空
         _actionRouters:null,//页面上的动作行为
         _actionRoutersMoreList:null,//页面上的更多动作行为
+        _contactApiRouter:null,//查看联系人
         detailHeight:750,
         activeIndex1:'0',
         activeIndex2:'0',
@@ -130,6 +131,20 @@ const Detail = function (source,para ,callBack) {
             }
             return rtn._otherTradeActionRouter;
           }
+        },        
+        get contactApiRouter() {
+          if (rtn._contactApiRouter !== null) {
+            return rtn._contactApiRouter;
+          }
+          else {
+            if (data.contactApiRouter) {                
+                var router = Router(data.contactApiRouter);
+                router.is = "ct-btn";
+                router.attrs = { size: "mini" }
+                rtn._contactApiRouter=router;
+            }
+            return rtn._contactApiRouter;
+          }
         },
         get actionRouters() {
             if (rtn._actionRouters !== null) {
@@ -295,7 +310,7 @@ const Detail = function (source,para ,callBack) {
           }
           if(field.id=='Follow' 
           || field.id=='Trust' || field.id=='TrustZJJ' || field.id=='TrustDJ' || field.id=='TrustPT'
-          || field.id=='RealLook'
+          || field.id=='RealLook' || field.id=='RealLookVR'
           || field.id=='StatusAdjust'
           || field.id=='OperationKey' || field.id=='OperationKeyCommon' || field.id=='OperationKeyPassword'
           || field.id=='Key'){
@@ -306,6 +321,9 @@ const Detail = function (source,para ,callBack) {
             else if(field.id=='TrustZJJ' || field.id=='TrustDJ' || field.id=='TrustPT'){
               id='Trust';
             }
+            else if(field.id=='RealLookVR'){
+              id='RealLook';
+            }
             var advIndex = rtn.tags1.findIndex((v) => {
               return v.appID === id;
             });

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

@@ -183,6 +183,10 @@ const Router = function (source) {
     get flagFreshCurrentRow() {
       return source.flagFreshCurrentRow;
     },
+    //路由操作完成后是根据返回ID读取数据新增行
+    get flagAddRowAfterAction() {
+      return source.flagAddRowAfterAction;
+    },
     get textColor() {
       return source.textColor || '';
     },

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

@@ -554,7 +554,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             console.error(error);
           });
       },
-      getCurrentRowApiData(callback) {
+      getCurrentRowApiData(callback,rtnData,router) {
         var self = this;
         var searchFields = this.searchModel ? this.searchModel.searchData : { fields: [] };
         if (self.primaryKey) {
@@ -563,7 +563,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             groupName: self.primaryKey,
             operation: 2,
             searchDataType: 3,
-            searchValue1: rtn.listData[rtn.selectIndex][self.primaryKey],
+            searchValue1: router.flagAddRowAfterAction? rtnData.responseData.content: rtn.listData[rtn.selectIndex][self.primaryKey],
           });
         }
         Vue.prototype.$api.postHandler(common.globalUri(), {
@@ -577,11 +577,23 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           .then(function (response) {
             if (response.rtnCode === Enum.ReturnCode.Successful) {
               if (response.content.rows.length > 0) {
-                response.content.rows.forEach((row) => {
-                  for (var vkey in row) {
-                    rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
-                  }
-                });
+                if(router.flagAddRowAfterAction){
+                  rtn.setStyleRow(response.content.rows);
+                  response.content.rows.forEach((nr) => {
+                    rtn.listData.unshift(nr);
+                  });
+                  rtn.dataDictionary = response.content.rows;
+
+                  source.page.rows = source.page.rows + response.content.rows.length;
+                  rtn.$vue.calculatingRowHeight()
+                }
+                else{
+                  response.content.rows.forEach((row) => {
+                    for (var vkey in row) {
+                      rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
+                    }
+                  });
+                }
               }
 
               if (typeof response.content.foot !== 'undefined') {

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

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