centaline-data-driven 1.3.17 → 1.3.20

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

@@ -10,9 +10,9 @@
         <!--头部元素-->
         <el-row v-if="collapseFieldsRow.length > 0">
           <el-col v-for="(col, index) in collapseFieldsRow[0]" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
-            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
+            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
-                       @input="inputHandler(col,$event)"
+                       @input="inputHandler(col,$event)" @importComplete="importComplete"
                        @popupSearchList="popupSearchListHandler"
                        @tableButtonClick="clickHandler"></component>
           </el-col>
@@ -24,7 +24,7 @@
                        v-for="(item, index) in collapse" v-if="item.show !== false" :key="index">
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
@@ -56,9 +56,9 @@
         <!--尾部元素-->
         <el-row v-if="independentItem.length > 0" style="margin-top: 20px;">
           <el-col v-for="(col, index) in independentItem" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
-            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)"
+            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
-                       @input="inputHandler(col,$event)"
+                       @input="inputHandler(col,$event)" @importComplete="importComplete"
                        @popupSearchList="popupSearchListHandler"
                        @tableButtonClick="clickHandler"></component>
           </el-col>
@@ -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;
@@ -595,7 +595,17 @@
                   self.$message.error(f.validMessage);
                 }
                 else{
-                  self.$message.error('【'+f.model.label+'】不能为空！');
+                  if(f.validMessage){
+                    if(f.validMessage=='必填'){
+                      self.$message.error('【'+f.model.label+'】'+f.validMessage);
+                    }
+                    else{
+                      self.$message.error(f.validMessage);
+                    }
+                  }
+                  else{
+                    self.$message.error('【'+f.model.label+'】不能为空！');
+                  }
                 }
               }
               i++;
@@ -671,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/File.js

@@ -215,7 +215,6 @@ const box = function (source, fileSourceList, router, optionApi) {
         classify.file.source.mediaLabelID = classify.option[rtn.optionModel.optionAttrs.value];
       },
       handleAvatarSuccess(res, file, fileList) {
-      
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联
           fileSourceList.push(res.content[0]);
@@ -240,11 +239,15 @@ const box = function (source, fileSourceList, router, optionApi) {
           rtn.fileList = fileList;//无数据会监听不到
         }
         else {
+          for (let i = 0; i < fileList.length; i++) {
+            if (fileList[i].uid === file.uid) {              
+              fileList.splice(i, 1);
+            }
+          }
           Vue.prototype.$message.error(res.rtnMsg);
         }
       },
       deleteFile(file, forceDelete) {
-
         for (let i = 0; i < rtn.fileList.length; i++) {
           if (rtn.fileList[i].uid === file.uid) {
             if (forceDelete) {
@@ -275,7 +278,6 @@ const box = function (source, fileSourceList, router, optionApi) {
             break;
           }
         }
-        console.log(rtn.fileList)
       },
       getFormObj() {
         var rtnFormObj = {};

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;

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -2,39 +2,25 @@
  * @Author: linchunmei 179466780@qq.com~
  * @Date: 2022-06-21 11:29:34
  * @LastEditors: linchunmei 179466780@qq.com
- * @LastEditTime: 2022-06-28 17:53:38
+ * @LastEditTime: 2022-07-04 09:46:56
  * @FilePath: \js-sdk-v3\src\centaline\quickInputSos\src\quickInput.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
   <div class="ct-quickInput">
-    <el-popover
-      ref="pop"
-      placement="bottom-start"
-      v-model="showDrop"
-      trigger="click"
-      @show="searchInputHandle"
-      class="more-dropdown"
-    >
+    <el-popover ref="pop" placement="bottom-start" v-model="showDrop" trigger="click" @show="searchInputHandle"
+      class="more-dropdown">
       <div>
         <div>
-          <el-input
-            ref="searchInput"
-            size="mini"
-            suffix-icon="el-icon-search"
-            v-model="searchText"
-            @input="searchInputHandle"
-          ></el-input>
+          <el-input ref="searchInput" size="mini" suffix-icon="el-icon-search" v-model="searchText"
+            @input="searchInputHandle"></el-input>
         </div>
-        <ctSelectOptionVertical
-          :model="model"
-          @click="selectOption($event)"
-        ></ctSelectOptionVertical>
+        <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
       </div>
-      <!-- <i slot="reference" class="el-icon-more"></i> -->
-      <span slot="reference" style="font-family: Comic Sans MS; font-size: 14px"
+      <i slot="reference" class="el-icon-arrow-down"></i>
+      <!-- <span slot="reference" style="font-family: Comic Sans MS; font-size: 14px"
         ><div class="my-icon-more"></div
-      ></span>
+      ></span> -->
     </el-popover>
   </div>
 </template>
@@ -100,22 +86,24 @@ export default {
       this.$emit("click", value);
     },
   },
-  mounted() {},
+  mounted() { },
 };
 </script>
-<style>
+<style scoped>
 .ct-quickInput .el-icon-more:hover {
   cursor: pointer;
   color: #409eff;
 }
+
 .more-dropdown {
   position: absolute;
   width: 16px;
   height: 20px;
   text-align: left;
-  top: 3px;
-  right: -2px;
+  top: 4px;
+  right: 6px;
 }
+
 .my-icon-more {
   width: 16px;
   height: 20px;
@@ -127,7 +115,8 @@ export default {
   margin-left: 5px;
   cursor: pointer;
 }
-.ct-flex-div .ct-flex-div-input {
-  padding-right: 12px;
-}
+
+/* .ct-quickInput.ct-flex-div-span {
+  width: 12px;
+} */
 </style>

package/src/main.js

@@ -12,11 +12,13 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 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.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/", 
   // flagRouterSelf: true,
   zindex: 999,
+  showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
   handler: {
     // 打开tab页
@@ -39,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'f6a35199-5dd7-423c-a4e4-e1553c3d76bb',
+        oldToken: 'a9e42494-1e0b-4c46-834e-eea096ba2564',
         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.eyJsb2dpbl91c2VyX2tleSI6ImVjODhjOTI1LTU3OTktNDVmNy1iNDI3LWI3M2QwNGVkNWM2NSJ9.fyndFOEg4ThBHv4N2pi3pmPaWWlcD1CVPsYu0G5BKAB1hAgkL_GpOMpCZB5xdjMJLbBVomdoUjnRY7T6JSZb-g',