centaline-data-driven 1.3.98 → 1.4.0

package/package.json

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

package/src/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="appDetail" style="height:100%;">
-    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
+    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1"} ,
+        apiParam: {actionType: 1,chanceID: "1583031531402825728"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/externalincomemanage/externalincomeimport/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>

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

@@ -345,8 +345,9 @@
               </el-tab-pane>
             </el-tabs>
           </div>
-          <div class="customer">
-            <div class="customer-title">匹配客户</div>
+          <div ref="MatchCustomer" v-if="model.matchCustomerApiRouter !== null" class="customer">
+            <ct-MatchCustomer :apiRouter="model.matchCustomerApiRouter"></ct-MatchCustomer>
+            <!-- <div class="customer-title">匹配客户</div>
             <div class="mt10 clearfix">
               <div class="customre-line"></div>
               <div class="match-customre rel">
@@ -397,7 +398,6 @@
                 </div>
               </div>
             </div>
-
             <div class="clearfix">
               <div class="customre-line"></div>
               <div class="match-customre rel">
@@ -447,7 +447,7 @@
                   </div>
                 </div>
               </div>
-            </div>
+            </div> -->
           </div>
         </div>
       </div>
@@ -460,6 +460,7 @@ import dynamicElement from "../../mixins/dynamicElement";
 import dynamicSearchList from "../../dynamicSearchList/src/dynamicSearchList.vue";
 import dynamicContactList from "./dynamicContactList.vue";
 import dynamicAlbums from "./dynamicAlbums.vue";
+import dynamicMatchCustomer from "./dynamicMatchCustomer.vue";
 export default {
   name: "ct-PropertyDetailOFI",
   mixins: [dynamicElement],
@@ -467,6 +468,7 @@ export default {
     "ct-searchlist": dynamicSearchList,
     "ct-contactList": dynamicContactList,
     "ct-albums": dynamicAlbums,
+    "ct-MatchCustomer": dynamicMatchCustomer,
   },
   props: {
     vmodel: Object,

package/src/centaline/dynamicDragSort/src/dynamicDragSort.vue

@@ -90,7 +90,6 @@ export default {
             else {
                 this.model = this.vmodel;
                 this.testList = this.vmodel.dragList;
-                // console.log('this.testList', this.testList);
             }
         });
 
@@ -130,7 +129,6 @@ export default {
 
         // 更新位置
         handleListChange(event) {
-            console.log(event);
             this.testList = event;
 
             this.testList.forEach((item, i) => {

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

@@ -486,11 +486,20 @@
                   });
                 }
                 else{
-                  field.doAction(submitData, (data) => {
-                    if(data.content){
-                      window.open(data.content, "_blank");
-                    }
-                  });
+                  if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
+                    window.open(field.action, "_blank");
+                  }
+                  else {
+                    field.doAction(submitData, (data) => {
+                      if(data.content){
+                        if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
+                          window.open(data.content, "_blank");
+                        }
+                        else {
+                        }
+                      }
+                    });
+                  }
                 }
               }
               else {

package/src/centaline/dynamicIti/src/dynamicIti.vue

@@ -91,7 +91,6 @@
 
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);//todo input事件里要不要加这个事件
-        console.log('onInputHandler');
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue

@@ -136,7 +136,6 @@
           var row = self.tableData[i];
 
           jumpFieldArr.forEach((v) => {
-            console.log(eval("row." + v));
             if (typeof eval("row." + v) !== 'undefined' && eval("row." + v).indexOf(self.jumpStr) >= 0) {
               jumpRow = row;
               return false;

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

@@ -1,46 +1,55 @@
 <template>
-  <div class="ct-table-tip ct-table-tip-mini" v-html="tip"></div>
+  <div class="ct-table-tip ct-table-tip-mini ct-table-tip-tag" v-html="tip"></div>
 </template>
 <script>
-  export default {
-    name: 'ct-tabletip',
-    props: {
-      tip: String,
-      size: String
-    },
-    data() {
-      return {}
-    }
+export default {
+  name: 'ct-tabletip',
+  props: {
+    tip: String,
+    size: String
+  },
+  data() {
+    return {}
   }
+}
 </script>
 <style>
-  .ct-table-tip {
-    color: #606266;
-    font-size: 18px;
-    line-height: 40px;
-    min-height: 40px;
-    padding-left: 15px;
-    display: table
-  }
+.ct-table-tip {
+  color: #606266;
+  font-size: 18px;
+  line-height: 40px;
+  min-height: 40px;
+  padding-left: 15px;
+  display: table
+}
 
-    .ct-table-tip img {
-      vertical-align: middle;
-    }
-  .ct-table-tip-mini {
-    font-size: 12px;
-    line-height: 26px;
-    min-height: 0px;
-  }
+.ct-table-tip img {
+  vertical-align: middle;
+}
 
-  .ct-table-tip-small {
-    font-size: 14px;
-    line-height: 32px;
-    min-height: 32px;
-  }
+.ct-table-tip-mini {
+  font-size: 12px;
+  line-height: 26px;
+  min-height: 0px;
+}
 
-  .ct-table-tip-medium {
-    font-size: 16px;
-    line-height: 36px;
-    min-height: 36px;
-  }
+.ct-table-tip-small {
+  font-size: 14px;
+  line-height: 32px;
+  min-height: 32px;
+}
+
+.ct-table-tip-medium {
+  font-size: 16px;
+  line-height: 36px;
+  min-height: 36px;
+}
+
+.ct-table-tip-tag {
+  margin-bottom: 10px;
+  background-color: #fdf6ec;
+  border-color: #faecd8;
+  width: 100%;
+  box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
+}
 </style>

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

@@ -7,12 +7,12 @@
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div max-input-group" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
-      <div ref="highlights" v-if="model.firbiddenWords" class="backdrop" :style="{width:firbiddenWordsWidth+'px',height:firbiddenWordsHeight+'px',left:firbiddenWordsLeft+'px',top:firbiddenWordsTop+'px'}">
-        <div  class="highlights" v-html="firbiddenWordsValue"></div>
+      <div ref="highlights" v-if="model.forbiddenWords" class="backdrop" :style="{width:forbiddenWordsWidth+'px',height:forbiddenWordsHeight+'px',left:forbiddenWordsLeft+'px',top:forbiddenWordsTop+'px'}">
+        <div  class="highlights" v-html="forbiddenWordsValue"></div>
       </div>
       <el-input ref="input" :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event);isShowClear();applyHighlights()" @change="changeHandler($event)"
-                class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'',model.firbiddenWords?'inputHighlights':'']" 
-                :disabled="model.lock" :rows="model.rows" 
+                class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'',model.forbiddenWords?'inputHighlights':'']" 
+                :disabled="model.lock" :rows="model.rows" :resize="model.forbiddenWords?'none':'vertical'"
                 :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
                 @keyup.enter.native="search()" style="z-index: 3;background-color: transparent;">
         <span slot="suffix" v-if="model.unitName" class="ct-unitname" :class="showClear?'unitName-20':'unitName-0'">{{model.unitName}}</span>
@@ -60,11 +60,11 @@
         showClear: false,
         minText:'',
         minTextLeft:0,
-        firbiddenWordsValue:'',
-        firbiddenWordsWidth:0,
-        firbiddenWordsHeight:0,
-        firbiddenWordsLeft:0,
-        firbiddenWordsTop:0,
+        forbiddenWordsValue:'',
+        forbiddenWordsWidth:0,
+        forbiddenWordsHeight:0,
+        forbiddenWordsLeft:0,
+        forbiddenWordsTop:0,
       }
     },
     created() {
@@ -86,11 +86,11 @@
         }
         this.minTextLeft=this.$refs.input.$el.offsetLeft+10;
       }
-      if(this.model.firbiddenWords){
-        this.firbiddenWordsWidth=this.$refs.input.$el.offsetWidth;
-        this.firbiddenWordsHeight=this.$refs.input.$el.offsetHeight;
-        this.firbiddenWordsLeft=this.$refs.input.$el.offsetLeft;
-        this.firbiddenWordsTop=this.$refs.input.$el.offsetTop;
+      if(this.model.forbiddenWords){
+        this.forbiddenWordsWidth=this.$refs.input.$el.offsetWidth;
+        this.forbiddenWordsHeight=this.$refs.input.$el.offsetHeight;
+        this.forbiddenWordsLeft=this.$refs.input.$el.offsetLeft;
+        this.forbiddenWordsTop=this.$refs.input.$el.offsetTop;
         this.$refs.input.$el.addEventListener('scroll',this.scrollHandler,true);
       }
     },
@@ -155,25 +155,27 @@
       },
       scrollHandler() {
         var scrollTop = this.$refs.input.$el.children[0].scrollTop;
-        var scrollHeight = this.$refs.input.$el.children[0].scrollHeight;
-        var offsetHeight = this.$refs.input.$el.children[0].offsetHeight;
-        //   console.log(scrollTop)
-        //   console.log(scrollHeight)
-        //   console.log(offsetHeight)
-        // if(scrollTop+offsetHeight>=scrollHeight){
-        //   scrollTop=scrollTop-32;
-        // }
         this.$refs.highlights.scrollTop=scrollTop;
       },
       applyHighlights() {
         var self=this;
-        if(self.model.firbiddenWords){
-          self.firbiddenWordsValue=self.model.value;
+        if(self.model.forbiddenWords){
+          self.forbiddenWordsValue=self.model.value;
           let joinChar=self.model.joinChar || ',';
-          self.model.firbiddenWords.split(joinChar).forEach(w => {
+          self.model.forbiddenWords.split(joinChar).forEach(w => {
             let reg1=new RegExp(w,'g');
-            self.firbiddenWordsValue=self.firbiddenWordsValue.replace(reg1,'<span style="background-color: red;color: transparent;">'+w+'</span>');
+            self.forbiddenWordsValue=self.forbiddenWordsValue.replace(reg1,'<span style="background-color: #ffff00;color: transparent;">'+w+'</span>');
           });
+          // let h=this.$refs.input.$el.children[0].offsetHeight;
+          // let hs=this.$refs.input.$el.children[0].scrollHeight;
+          // let ht=this.$refs.input.$el.children[0].scrollTop;
+          // console.log(ht+','+h+','+hs)
+          let appoint='\n';
+          let strat=self.forbiddenWordsValue.length-appoint.length;
+          let char=self.forbiddenWordsValue.substr(strat,appoint.length);
+          if(char===appoint){
+            self.forbiddenWordsValue=self.forbiddenWordsValue+' ';
+          }
         }        
       },   
     },
@@ -211,12 +213,5 @@
   color: transparent;
   padding: 5px 15px 5px 15px;
   line-height: 1.5;
-  /* overflow-y: auto;
-  width: 100%;
-  height: 100%;
-  border-radius: 4px;
-  resize: vertical;
-  box-sizing: border-box;
-  transition: border-color .2s cubic-bezier(.645,.045,.355,1); */
 }
 </style>

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

@@ -301,9 +301,9 @@ const Base = function (source) {
     get description() {
       return source.description;
     },
-    // get firbiddenWords() {
-    //   return source.description;
-    // },
+    get forbiddenWords() {
+      return source.forbiddenWords;
+    },
     get joinChar() {
       return source.joinChar;
     },

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

@@ -519,7 +519,6 @@ const Detail = function (source, para, callBack) {
             }
           })
           .catch((error) => {
-            console.error(error);
             if (typeof callback !== 'undefined') {
               callback();
             }

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

@@ -10,7 +10,7 @@ const box = function (source, fileSourceList, router, optionApi) {
   var init = function (data) {
     var rtn = {
       get action() {
-        return router.action ? router.action : "";//上传完整地址
+        return router && router.action ? router.action : "";//上传完整地址
       },
       get sourceList() {
         return fileSourceList;

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

@@ -29,7 +29,6 @@ const PhotoSelectList = function (source, callBack,searchModel, defaultSearchDat
             }
           })
           .catch((error) => {
-            console.error(error);
             if (typeof callback !== 'undefined') {
               callback();
             }

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

@@ -87,7 +87,6 @@ const Repeat = function (source, master, isFormList) {
         enumerable: true,
         configurable: true
       });
-      console.log(rtnObj);
       return rtnObj;
     },
     _buttons: null,

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

@@ -95,7 +95,6 @@ const SearchStats = function (source, callBack, searchModel, defaultSearchData)
             }
           })
           .catch((error) => {
-            console.error(error);
             if (typeof callback !== 'undefined') {
               callback();
             }

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

@@ -571,7 +571,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             if (self.searchModel) {
               // self.searchModel.setBtnLoading(false);
             }
-            console.error(error);
           });
       },
       getSearchData(){
@@ -806,7 +805,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
           })
           .catch((error) => {
-            console.error(error);
             if (typeof callback !== 'undefined') {
               callback();
             }
@@ -835,37 +833,52 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               rtn.$vue.$delete(rtn.listData, rtn.selectIndex);
             }
             break;
+
           case Enum.ActionType.New: //新增
           case Enum.ActionType.CloseTabThenNew: //新增
+            if(response.content && Array.isArray(response.content)){
+              rtn.setStyleRow(response.content);
+              response.content.forEach((nr) => {
+                rtn.listData.unshift(nr);
+              });
+              rtn.dataDictionary = response.content;
 
-            rtn.setStyleRow(response.content);
-            response.content.forEach((nr) => {
-              rtn.listData.unshift(nr);
-            });
-            rtn.dataDictionary = response.content;
-
-            source.page.rows = source.page.rows + response.content.length;
-            rtn.$vue.calculatingRowHeight()
+              source.page.rows = source.page.rows + response.content.length;
+              rtn.$vue.calculatingRowHeight()
+            }
+            else{
+              rtn.$vue.updateCurrentRow({flagAddRowAfterAction:true},{responseData:response});
+            }
             break;
+
           case Enum.ActionType.Update: //修改
           case Enum.ActionType.CloseTabThenUpdate: //修改
-            response.content.forEach((row) => {
-              for (var vkey in row) {
-                rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
-              }
-            });
+            if(response.content && Array.isArray(response.content)){
+              response.content.forEach((row) => {
+                for (var vkey in row) {
+                  rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
+                }
+              });
+            }
+            else{
+              rtn.$vue.updateCurrentRow({flagFreshCurrentRow:true},{responseData:response});
+            }
             break;
+
           case Enum.ActionType.Export: //导出
             var fileName = response.content.fieldName1;
             var fileContent = window.atob(response.content.code1);
             common.saveFile(fileName, fileContent);
             break;
+
           case Enum.ActionType.Refersh: //刷新
             rtn.$vue.getPage(1);
             break;
+
           case Enum.ActionType.RefreshParent: //刷新父页面
             rtn.$vue.$emit('refreshParent');
             break;
+
           default:
             break;
         }

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

@@ -113,7 +113,6 @@ const tree = function (source, callBack, searchModel, defaultSearchData, resolve
             }
           })
           .catch((error) => {
-            console.error(error);
             if (typeof callback !== 'undefined') {
               callback();
             }

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

@@ -295,8 +295,8 @@ const LibFunction = {
         var files = [];
         if(source.medias && source.medias.length>0){
           source.medias.forEach((v, index) => {
-            if (v.GroupID) {
-              if (v.GroupID == field.fieldName1) {
+            if (v.groupID || v.GroupID) {
+              if (v.groupID == field.fieldName1 || v.GroupID == field.fieldName1) {
                 files.push(v);
               }
             } else {

package/src/centaline/validate/index.js

@@ -157,6 +157,20 @@ const actions = {
       return true;
     }
   },
+  forbiddenWords(model) {
+    var flag=true;
+    if (model.value) {
+      let joinChar= model.joinChar || ',';
+      model.forbiddenWords.split(joinChar).forEach(w => {
+        let reg1=new RegExp(w,'g');
+        if(reg1.test(model.value)){
+          flag=false;
+          return;
+        }
+      });
+    }
+    return flag;
+  },
 };
 
 const valid = {
@@ -229,6 +243,12 @@ const valid = {
     type: 'validateLenMin',
     ticker: 'input'
   },
+  forbiddenWords: {
+    action: actions.forbiddenWords,
+    message: '输入文字中包含违禁词',
+    type: 'forbiddenWords',
+    ticker: 'input'
+  },
   Init(model) {
     return {
       //废弃 todo 删除
@@ -303,6 +323,9 @@ const valid = {
             if(model.min && model.min>0){
               rtnValidate.push(valid.validateLenMin);
             }
+            if(model.forbiddenWords){
+              rtnValidate.push(valid.forbiddenWords);
+            }
             break;
           default:
             break;

package/src/main.js

@@ -43,19 +43,19 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '854e91e2-3a5e-42af-a522-c51a0f5c09bc',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbC9rL2pgMnNBwicpxFChXKRwIh7g6IpEvPFFNM894TxrmFEvwCbmilkQXc0EpjDIk3XONBfERichhMDBiJI52q2sVjBQXo_QalYfaWhfe-gD5Nv2CCs98wjzqc9fGPc9ep_8zmJGJDzthaViQVxbQjwtSpdqSOLjbB6w0AAP__.nf7jF3ewbimJ8eNFZ72RKXS7qN0SgN5OnkZ0ZEk82Rc',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPssMPMDp0u2HgIsuqaYGUEEo3x7mqEjt5XvOI1_z9hmA5Qg87gihY6m8EVLXREbErS4sY0Igt7DBQDRpbIu6b1cdtAAfl-hZpEtPIlGRXQp_EXmCv9hmnIt31-_OPcZew_s2cV59QlrMokyGyC4UiM5imcUmavOcHrDQAA__8.UYFAmH-EyzlQ5Z7PVk1zwypPlLjm84H3Benfnmna9WU',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
         estateId: '20210729104021C49F04B55C50F6AF58',
 
-        authObject: '{"currentEstate":{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImVmNjc2YjhmLThhM2ItNGQzMy05NGMxLWYzNWUxM2Q1MTc2MyJ9.eaCMvEh4HzqQPy6YRd4DWZx6hEvqagHebzSj_yeMKZy-hPXYMA6EXXauhEMoRIkB2df4l2viZ5-BD8l-nCv65A',
+        authObject: '{"currentEstate":{},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjcyYzkxMzRlLTc5ODItNDFiYi04NDZjLWRhNmE0YTAwNGUzZSJ9.Dqw228vC10bapkK7Rnz_REvV_1x3igpsmFVHfeSIMFPHkMSpeh6py61NJ7HtkYnTTrSeRr2IjXvH9EoHLH3T3Q',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作
     requestComplete: function (response) {
-      // console.log(response);
+      
     }
   }});