centaline-data-driven 1.3.19 → 1.3.20

package/package.json

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

package/src/centaline/common/index.js

@@ -687,6 +687,18 @@ const common = {
     str = charUpper + str.slice(1);
     return str;
   },
+  getDataOfUpperLower(model,key){
+    if(model[key]){
+      return model[key];
+    }
+    else if(model[this.initialsToUpperCase(key)]){
+      return model[this.initialsToUpperCase(key)];
+    }
+    else if(model[this.initialsToLowerCase(key)]){
+      return model[this.initialsToLowerCase(key)];
+    }
+    return '';
+  },
 
   /**
    * @method

package/src/centaline/css/common.css

@@ -824,4 +824,8 @@ html {
 .shortcutFollow .el-collapse{
   border-bottom: none;
 }
+.ct-form .el-tabs__content .el-row [class*=el-col-]{
+  float: none;
+  display: inline-block;
+}
 

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

@@ -10,30 +10,13 @@
             <span>{{ model.fields1Dic.EstateName.value }}</span>
             <span> {{ model.fields1Dic.BuildingName.value }}</span>
             <span>{{ model.fields1Dic.RoomNo.value }}</span>
-            <img
-              :src="model.fields1Dic.FavoriteUrl.value"
-              alt=""
-              class="collection"
-            />
+            <img :src="model.fields1Dic.FavoriteUrl.value" alt="" class="collection"/>
           </div>
           <div class="title-other">
-            <span
-              >{{ model.fields1Dic.PropertyNo.label
-              }}{{ model.fields1Dic.PropertyNo.value }}</span
-            >
-            <span
-              >{{ model.fields1Dic.GovNo.label
-              }}{{ model.fields1Dic.GovNo.value }}</span
-            >
-            <span class="mr10">{{
-              model.fields1Dic["DistrictName"].value +
-              model.fields1Dic.AreaName.value
-            }}</span>
-            <img
-              :src="model.fields1Dic.LocationUrl.value"
-              alt=""
-              class="location"
-            />
+            <span>{{ model.fields1Dic.PropertyNo.label }}{{ model.fields1Dic.PropertyNo.value }}</span>
+            <span>{{ model.fields1Dic.GovNo.label}}{{ model.fields1Dic.GovNo.value }}</span>
+            <span class="mr10">{{model.fields1Dic["DistrictName"].value +model.fields1Dic.AreaName.value}}</span>
+            <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location"/>
           </div>
           <div class="title-tags">
             <div
@@ -280,20 +263,10 @@
                 </div>
               </div>
             </div>
-            <div
-              v-for="(col, index) in collapse"
-              :key="index"
-              class="info-conten-b"
-              v-show="allInfo"
-            >
+            <div v-for="(col, index) in collapse" :key="index" class="info-conten-b" v-show="allInfo">
               <div class="info-row mb20">
-                <div
-                  v-for="(c, i) in col"
-                  :key="i"
-                  :class="c.singleLine === true ? 'row-i100' : 'row-i'"
-                >
-                  <span>{{ c.label }}</span
-                  ><span>{{ c.value }}</span>
+                <div v-for="(c, i) in col" :key="i" :class="c.singleLine === true ? 'row-i100' : 'row-i'">
+                  <span>{{ c.label }}</span><span>{{ c.value }}</span>
                 </div>
               </div>
             </div>
@@ -724,31 +697,28 @@ export default {
       }
     );
     this.$nextTick(function () {
-      if (
-        self.parentModel &&
-        self.parentModel.$refs &&
-        self.parentModel.$refs.table
-      ) {
+      if ( self.parentModel && self.parentModel.$refs && self.parentModel.$refs.table ) {
         if (self.parentModel.$refs.table.model.selectIndex <= 0) {
           self.flagDisabledPrev = true;
         }
-        if (
-          self.parentModel.$refs.table.model.listData &&
-          self.parentModel.$refs.table.model.selectIndex ===
-            self.parentModel.$refs.table.model.listData.length - 1
+        if ( self.parentModel.$refs.table.model.listData 
+        && self.parentModel.$refs.table.model.selectIndex === self.parentModel.$refs.table.model.listData.length - 1
         ) {
           self.flagDisabledNext = true;
         }
-      } else {
+      } 
+      else {
         self.flagDisabledPrev = true;
         self.flagDisabledNext = true;
       }
 
       if (self.vmodel) {
         self.load(self.vmodel);
-      } else if (typeof self.source !== "undefined") {
+      } 
+      else if (typeof self.source !== "undefined") {
         self.loaderObj.Detail(self.source, null, self.load);
-      } else if (typeof self.api !== "undefined") {
+      } 
+      else if (typeof self.api !== "undefined") {
         self.loaderObj.Detail(self.api, self.apiParam, self.load);
       }
     });
@@ -847,7 +817,8 @@ export default {
         if (v.type === 13) {
           collapseItemArr = [];
           col = 0;
-        } else if (v.singleLine) {
+        } 
+        else if (v.singleLine) {
           if (collapseItemArr.length > 0) {
             self.collapse.push(collapseItemArr);
             collapseItemArr = [];
@@ -856,7 +827,8 @@ export default {
           self.collapse.push(collapseItemArr);
           collapseItemArr = [];
           col = 0;
-        } else if (v.spanCols) {
+        } 
+        else if (v.spanCols) {
           collapseItemArr.push(v);
           col = col + v.spanCols;
           if (col === colCount || index === self.model.fields2Dic.length - 1) {
@@ -864,7 +836,8 @@ export default {
             collapseItemArr = [];
             col = 0;
           }
-        } else {
+        } 
+        else {
           collapseItemArr.push(v);
           col = col + 1;
           if (col === colCount || index === self.model.fields2Dic.length - 1) {
@@ -886,6 +859,9 @@ export default {
     lookOwner() {
       this.codeOwner = true;
     },
+    loadBaseInfo() {
+      this.model.loadBaseInfo();
+    },
     handleClick(tab, event) {
       let i = tab.index;
       if (this.model.tags2 && this.model.tags2[i]) {
@@ -964,16 +940,26 @@ export default {
           router.submitFormField.forEach((v) => {
             submitData[v] = field.list[field.listIndex].code;
           });
-        } else {
+        } 
+        else {
           router.submitFormField.forEach((v) => {
             submitData[v] = self.model.fields1Dic[v].value;
           });
         }
+        if(router.id=="PropertyEdit"){
+          callBack="loadBaseInfo"
+        }
       }
 
-      if (callBack && callBack == "loadOperation") {
-        this.routerClickHandler(router, submitData, self.loadOperation);
-      } else {
+      if (callBack) {
+        if(callBack=='loadOperation'){
+          this.routerClickHandler(router, submitData, self.loadOperation);
+        }
+        else if(callBack=='loadBaseInfo'){
+          this.routerClickHandler(router, submitData, self.loadBaseInfo);
+        }
+      } 
+      else {
         this.routerClickHandler(router, submitData);
       }
     },
@@ -1021,7 +1007,8 @@ export default {
               ],
             };
             self.$common.openDialog(dialogOption);
-          } else if (field.isOpenList) {
+          } 
+          else if (field.isOpenList) {
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),
@@ -1049,7 +1036,8 @@ export default {
               ],
             };
             self.$common.openDialog(dialogOption);
-          } else if (field.isFormPageInTab) {
+          } 
+          else if (field.isFormPageInTab) {
             // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
@@ -1061,24 +1049,29 @@ export default {
                 self.model,
                 field.dialogWidth
               );
-          } else if (field.isSearchPageInTab) {
+          } 
+          else if (field.isSearchPageInTab) {
             // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
               .handler.openTabSearch(field, submitData);
-          } else if (field.isBrowserNewTab) {
+          } 
+          else if (field.isBrowserNewTab) {
             // 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
             window.open(field.action + query, "_blank");
-          } else if (field.isOpenUrlInBrowse) {
+          } 
+          else if (field.isOpenUrlInBrowse) {
             // 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");
-          } else if (field.isSeeVoice) {
+          } 
+          else if (field.isSeeVoice) {
             //看视频
             self.$common.browseVideo(field, submitData);
-          } else {
+          } 
+          else {
             field.doAction(submitData, (data) => {
               self.model.doAction(data, field);
               if (callBack) {
@@ -1103,8 +1096,7 @@ export default {
       }
 
       if (field.alert) {
-        self.$common
-          .confirm(field.alertMsg, field.alertCaption, {
+        self.$common.confirm(field.alertMsg, field.alertCaption, {
             confirmButtonText: field.alertOKButtonText,
             cancelButtonText: field.alertCancelButtonText,
             //type: 'warning'
@@ -1114,7 +1106,8 @@ export default {
             clickAcion(field, submitData);
           })
           .catch(() => {});
-      } else {
+      } 
+      else {
         clickAcion(field, submitData);
       }
     },

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

@@ -254,6 +254,9 @@
         this.model._operationRouters=[];
         this.model.getOperationList();
       },
+      loadBaseInfo() {
+        this.model.loadBaseInfo();
+      },
       handleClick(tab, event) {
         let i=tab.index;
         if(this.model.tags2 && this.model.tags2[i]){
@@ -310,10 +313,18 @@
               submitData[v] = self.model.fields1Dic[v].value;
             });
           }
+          if(router.id=="PropertyEdit"){
+            callBack="loadBaseInfo"
+          }
         }
 
-        if(callBack && callBack=='loadOperation'){
-          this.routerClickHandler(router,submitData,self.loadOperation);  
+        if(callBack){
+          if(callBack=='loadOperation'){
+            this.routerClickHandler(router, submitData, self.loadOperation);
+          }
+          else if(callBack=='loadBaseInfo'){
+            this.routerClickHandler(router, submitData, self.loadBaseInfo);
+          }
         }
         else{
           this.routerClickHandler(router,submitData);

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

@@ -428,7 +428,7 @@
               submitData = {};
               var tempFormData = self.model.getFormObj();
               field.submitFormField.forEach((v) => {
-                submitData[v] = tempFormData[v];
+                submitData[v] = self.$common.getDataOfUpperLower(tempFormData,v);
               });
             }
             submitData = field.getActionPara(submitData).para;
@@ -539,7 +539,7 @@
         var check = true;
         var checkMsg;
         router.submitFormField.forEach((v) => {
-          submitData[v] = tempFormData[v];
+          submitData[v] = self.$common.getDataOfUpperLower(tempFormData,v);
           if (typeof tempFormData[v] === "undefined") {
             if (self.model.fieldsDic[v]) {
               checkMsg = "请先录入" + self.model.fieldsDic[v].label;
@@ -681,12 +681,7 @@
         else{
           if(field.submitFormField){
             field.submitFormField.forEach((v) => {
-              if(tempFormData[v]){
-                submitData[v] = tempFormData[v];
-              }
-              else{
-                submitData[v] = tempFormData[self.$common.initialsToUpperCase(v)];
-              }
+              submitData[v] = self.$common.getDataOfUpperLower(tempFormData,v);
             });
           }
         }

package/src/centaline/dynamicLayout/src/dynamicLayout.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading" class="ct-Layout" v-if="Layout !== null && !loading">
-    <ct-layoutchildren :rowindex="rowindex" :vmodel="Layout" @click="clickHandler"></ct-layoutchildren>
+    <ct-layoutchildren :rowindex="rowindex" :actionRouter="actionRouter" :rowdata="vmodel" :vmodel="Layout" @click="clickHandler"></ct-layoutchildren>
   </div>
 </template>
 <script>
@@ -225,7 +225,10 @@
     },
     mounted() {
 
-    }
+    },
+    beforeDestroy() {
+      this.Layout = [];
+    },
   }
 </script>
 <style>

package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container v-if="model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
-    <component v-for="(item, index) in model.fields" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
+    <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
   </el-container>
 </template>
 <script>
@@ -20,9 +20,12 @@
     },
     props: {
       vmodel: Object,
+      rowdata: Object,
+      actionRouter: Array,
       rowindex: Number,
       forname: String,
-      forrowindex: String
+      forrowindex: String,
+
     },
     data() {
       return {
@@ -39,7 +42,10 @@
     },
     mounted() {
 
-    }
+    },
+    beforeDestroy() {
+      this.model = {};
+    },
   }
 </script>
 <style>

package/src/centaline/dynamicLayout/src/dynamicLayoutChildrenFor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container v-if="model.visibility!='0'" :direction="model.orientation" :style="model.styleObject">
-      <ct-layoutchildren v-for="(item, index) in model.fields" :key="index" :rowindex="rowindex" :forrowindex="model.forrowindex" :vmodel="item" :forname="model.forname" @click="clickHandler"></ct-layoutchildren>
+      <ct-layoutchildren v-for="(item, index) in model.fields" :rowdata="rowdata" :actionRouter="actionRouter" :key="index" :rowindex="rowindex" :forrowindex="model.forrowindex" :vmodel="item" :forname="model.forname" @click="clickHandler"></ct-layoutchildren>
   </el-container>
 </template>
 <script>
@@ -13,6 +13,8 @@
     },
     props: {
       vmodel: Object,
+      rowdata: Object,
+      actionRouter: Array,
       rowindex: Number
     },
     data() {
@@ -31,7 +33,10 @@
     },
     mounted() {
 
-    }
+    },
+    beforeDestroy() {
+      this.model = {};
+    },
   }
 </script>
 <style>

package/src/centaline/dynamicLayout/src/dynamicLayoutImage.vue

@@ -24,6 +24,8 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
+      rowdata: Object,
+      actionRouter: Array,
       rowindex: Number,
       forname: String,
       forrowindex: String
@@ -47,7 +49,7 @@
     },
     created() {
       if (typeof this.vmodel !== 'undefined') {
-        this.model = this.loaderObj.CellLayout(this.vmodel);
+        this.model = this.loaderObj.CellLayout(this.vmodel, this.actionRouter, this.rowdata, this.forname, this.forrowindex); 
       }
     },
    
@@ -80,9 +82,18 @@
           if (data.content.imgUrl) this.tellImgUrl = data.content.imgUrl;
         }
       },
+      closeCallTel() {
+        if (this.visible) {
+          this.visible = false;
+          this.tellImgUrl = '';
+        }
+      },
     },
     computed: {
      
-    }
+    },
+    beforeDestroy() {
+      this.model = {};
+    },
   }
 </script>

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -17,6 +17,7 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
+      actionRouter: Array,
       rowindex: Number,
       forname: String,
       forrowindex: String
@@ -26,7 +27,8 @@
       }
     },
     created() {
-      this.model = this.loaderObj.CellLayout(this.vmodel);
+      this.model = this.loaderObj.CellLayout(this.vmodel, this.actionRouter, this.rowdata, this.forname, this.forrowindex); 
+     
     },
    
     methods: {
@@ -36,7 +38,10 @@
     },
     computed: {
      
-    }
+    },
+    beforeDestroy() {
+      this.model = {};
+    },
   }
 </script>
 <style>

package/src/centaline/dynamicLayout/src/dynamicLayoutLine.vue

@@ -26,6 +26,9 @@
     },
     computed: {
      
-    }
+    },
+    beforeDestroy() {
+      this.model = {};
+    },
   }
 </script>

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

@@ -1084,6 +1084,11 @@
                 field.doAction(submitData, (data) => {
                   self.model.doAction(data, field);
                   if (field.actionType === 19) {
+                    if (self.model.currentCallTellayout) {
+                      self.closeCallTel(self.$refs[self.model.currentCallTellayout][0]);
+                    }
+                    self.model.currentCallTellayout = 'layout' + rowindex;
+                    self.model.currentCallTelrouter = 'router' + forname + forrowindex;
                     self.callTelClick(self.$refs['layout' + rowindex][0], data, forname, forrowindex)
                   }
                 })
@@ -1119,6 +1124,7 @@
         }
       },
       callTelClick(VueCom, data, forname, forrowindex) {
+        var self = this;
         if (typeof VueCom.$refs['router' + forname + forrowindex] !== "undefined") {
           VueCom.callTelClick(data);
           return true;
@@ -1133,6 +1139,26 @@
           }
         }
       },
+      closeCallTel(VueCom) {
+        var self = this;
+        if (self.model.currentCallTelrouter) {
+          if (typeof VueCom.$refs[self.model.currentCallTelrouter] !== "undefined") {
+            console.log(VueCom);
+            VueCom.closeCallTel();
+            return true;
+          }
+          if (VueCom.$children.length > 0) {
+            for (var i = 0; i < VueCom.$children.length; i++) {
+              var item = VueCom.$children[i];
+              var result = this.closeCallTel(item);
+              if (result) {
+                return result;
+              }
+            }
+          }
+        }
+
+      },
       selectAll($ev) {
         this.model.listData.forEach((ro) => {
           if (!this.model.rightMulti || ro[this.model.rightMulti] == 1) {

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

@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import Enum from './lib/Enum';
 import common from '../../../common';
-const CellLayout = function (source) {
+const CellLayout = function (source, actionRouter,rowdata, forname, forrowindex) {
   var rtn = {
     get fields() {
       return source.fields;
@@ -49,6 +49,18 @@ const CellLayout = function (source) {
       return source.forrowindex;
     },
     get rightRouter() {
+      if (forname) {
+        var forrightRouter = false;
+        let field = actionRouter.find(b => {
+          return b.id === source.routerKey;
+        });
+        if (typeof field !== "undefined") {
+          if (!field.rightField || rowdata[forname][forrowindex][field.rightField] == 1) {
+            forrightRouter=true;
+          }
+        }
+        return forrightRouter;
+      }
       return source.rightRouter;
     },
     _styleObject: {},

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

@@ -132,7 +132,7 @@ const ContactList = function (source,para ,callBack) {
                 return v.flagSort;
               },
               get sortName() {
-                return v.sortBy;
+                return v.sortBy || v.fieldName;
               },
               get sortAction() {
                 return v.sc;

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

@@ -137,7 +137,7 @@ const ContactList = function (source,para ,callBack) {
                 return v.flagSort;
               },
               get sortName() {
-                return v.sortBy;
+                return v.sortBy || v.fieldName;
               },
               get sortAction() {
                 return v.sc;

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

@@ -65,9 +65,15 @@ const Detail = function (source, para, callBack) {
       get fields1() {
         return data.fields1;
       },
+      set fields1(v) {
+        data.fields1=v;
+      },
       get fields2() {
         return data.fields2;
       },
+      set fields2(v) {
+        data.fields2=v;
+      },
       get labels() {
         return data.labels;
       },
@@ -245,6 +251,9 @@ const Detail = function (source, para, callBack) {
       get tags1() {
         return data.tags1;
       },
+      set tags1(v) {
+        data.tags1 = v;
+      },
       get searchConditionApiTags1() {
         if (rtn._searchConditionApiTags1 !== null) {
           return rtn._searchConditionApiTags1;
@@ -440,6 +449,19 @@ const Detail = function (source, para, callBack) {
         }
         return rtn;
       },
+      loadBaseInfo(){
+        Vue.prototype.$api.postHandler(common.globalUri(), { action: source, para: para }).then(
+          function (response) {
+            if (response.rtnCode === Enum.ReturnCode.Successful) {
+              rtn._fields1Dic=null;
+              rtn._fields2Dic=null;
+              rtn.fields1=response.content.fields1;
+              rtn.fields2=response.content.fields2;
+              rtn.$vue.loadFields();
+            }
+          }
+        );
+      },
     };
     return rtn;
   }

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

@@ -67,7 +67,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                   return v.flagSort;
                 },
                 get sortName() {
-                  return v.sortBy;
+                  return v.sortBy || v.fieldName;
                 },
                 get sortAction() {
                   return v.sc;