centaline-data-driven 1.2.91 → 1.2.94

package/build/centaline/centaline.path.js

@@ -44,6 +44,7 @@ const paths = {
     "dynamicCompound": "./src/centaline/dynamicCompound/index.js",//复合控件
     "dynamicContact": "./src/centaline/dynamicContact/index.js",//联系人电话
     "dynamicLayout": "./src/centaline/dynamicLayout/index.js",//Layout组件
+    "browseVideo": "./src/centaline/browseVideo/index.js",//确认框组件
   },
   "plugs": {
     "api": "./src/centaline/api/index.js",//调用API插件

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/salematter/agent/readDetail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -13,23 +13,12 @@
     name: 'App',
     data() {
       return {
-        // apiParam: {profitReturnId: "1504359257134055426", actionType: 1, pageStyle: 2, pageTitle: "查看返利", pageOnly: true} ,
-        // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
-        // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
-        // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
         apiParam:{
-actionType: 2,
-		jsonData: {
-			searchFields: {
-				fields: [{
-					fieldName1: "estateId",
-					groupName: "estateId",
-					operation: 2,
-					searchDataType: 3,
-					searchValue1: "201703020943128D8A8FCF463E4016D6"
-				}]
-			}
-		}
+actionType: 3,
+originalTraId: "1530076554013306882",
+pageOnly: true,
+pageStyle: 2,
+pageTitle: "成交报告",
           }
       }
     },

package/src/SearchList.vue

@@ -13,8 +13,6 @@
                     :searchStatsApi="'/exampleList/getListStats'"
                    ></ct-searchlist>
 
-    <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyStatusList/getLayoutOfSearch'" :searchDataApi="'/PropertyStatusList/getListOfSearchModel'"  :apiParam="para"></ct-searchlist> -->
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

package/src/centaline/browseVideo/index.js

@@ -0,0 +1,11 @@
+import browseVideo from './src/browseVideo'
+
+browseVideo.install = function (Vue) {
+  Vue.component(browseVideo.name, browseVideo);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(browseVideo);
+}
+
+export default browseVideo;

package/src/centaline/browseVideo/src/browseVideo.vue

@@ -0,0 +1,30 @@
+<template>
+  <div>
+    <div class="alert fade in" role="alert" style="padding:0px;border-bottom:none;display: table-caption;margin-left: 5px;">
+      <video :src="submitData[router.submitFormField]" controls="true" autoplay controlslist="nodownload" 
+        :height="router.dialogHeight?router.dialogHeight-10:'40'" :width="router.dialogWidth?router.dialogWidth-10:'100%'">您的浏览器不支持 video 标签。
+      </video>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'ct-video',
+    props: {
+      router: Object,
+      submitData: Object,
+    },
+    data() {
+      return {
+
+      };
+    },
+    methods: {
+      clickHandler(ev, v) {        
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

package/src/centaline/common/index.js

@@ -215,7 +215,10 @@ const common = {
    */
   closeDialog(vmodel) {
     if (vmodel) {
-      if (vmodel.name === 'ct-comfirm' || vmodel.$options.name === 'ctDialog' || vmodel.$options.name === 'ct-dialog') {
+      if (vmodel.name === 'ct-comfirm' 
+      || vmodel.$options.name === 'ctDialog' 
+      || vmodel.$options.name === 'ct-dialog' 
+      || vmodel.$options.name === 'ct-video') {
         this.dialogList.deleteDialog(vmodel);
         return;
       }
@@ -269,6 +272,30 @@ const common = {
 
   },
 
+  browseVideo(router, submitData) {
+    let self = this;
+
+    return new Promise((resolve, reject) => {
+      var dialogOption = {
+        title: router.pageTitle,
+        name: 'ct-video',
+        vmodel: {},
+        content: [{
+          component: 'ct-video',
+          attrs: {
+            router: router,
+            submitData: submitData,
+            width: router.dialogWidth + 'px',
+            height: router.dialogHeight + 'px'
+          },
+          on: {
+          }
+        }]
+      };
+      this.openDialog(dialogOption);
+    })
+  },
+
   /**
    * @method
    * @param {Object} evControl 指定Vue对象

package/src/centaline/dynamicCompound/src/dynamicCompound.vue

@@ -1,11 +1,11 @@
 <template>
-  <el-row v-if="model.fields.length > 0">
-    <el-col v-for="(col, index) in model.fields" :key="index" v-if="col.show !== false" :span="col.colspan" :class="index>0&&col.label==''?'complex-left-10':''">
+  <el-container  v-if="model.fields.length > 0">
+    <div v-for="(col, index) in model.fields" :key="index" v-if="col.show !== false" :class="index>0&&col.label==''?'complex-left-10':''" :style="{'width':(col.width!='0'?col.width+'px':'100%'),'flex':(col.width!='0'?'0 0 '+col.width+'px':'100%')}">
       <component ref="Fields" :is="col.is" :vmodel="col" :api="model.OptApi" v-bind="col.bindPara"
-                           @click="fieldClickHandler(col,index)" @change="changeHandler(col,index)"
-                           @input="inputHandler(col,index)"></component>
-    </el-col>
-  </el-row>
+                 @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
+                 @input="inputHandler(col,$event)"></component>
+    </div>
+  </el-container>
 </template>
 
 <script>
@@ -15,7 +15,6 @@
     },
     data: function () {
       return {
-
       }
     },
     methods: {
@@ -30,7 +29,8 @@
     },
     props: {
       vmodel: Object,
-      api: String
+      api: String,
+      parentModel: Object,
     },
     data() {
       return {
@@ -40,7 +40,6 @@
       }
     },
     created() {
-      let self = this;
       this.model = this.vmodel;
       this.model.OptApi = this.api;
     },
@@ -67,17 +66,69 @@
         } 
         return rtnBool;
       },
-      changeHandler(field,index) {
+      changeHandler(field) {
         var self = this;
-        this.model.change = field.change;
-        self.$emit('change');
+       
+        self.model.isChanged = true;
+        self.model.hiddenHandle(field);
+        self.model.requiredHandle(field);
+        //self.model.validMrf(field);
+
+        if (field.onAfterChanged) {
+          var router = self.model.actionRouters.find((v) => {
+            return v.id === field.onAfterChanged;
+          });
+          self.$parent.$parent.$parent.$parent.clickHandler(router);
+        }
+
+        self.$forceUpdate();
+      },
+      enterHandler(field) {
+        var self = this;
+       
+        self.model.isChanged = true;
+        self.model.hiddenHandle(field);
+        self.model.requiredHandle(field);
+        //self.model.validMrf(field);
+
+        if (field.routerKeyForEnterKey) {
+          var router = self.model.actionRouters.find((v) => {
+            return v.id === field.routerKeyForEnterKey;
+          });
+          self.$parent.$parent.$parent.$parent.clickHandler(router);
+        }
+
+        self.$forceUpdate();
       },
-      inputHandler(field, index) {
+      inputHandler(field) {
         var self = this;
         this.model.input = field.input;//当前小组件事件作为大组件事件
         self.$emit('input');
 
       },
+      fieldClickHandler(field) {
+        let submitData = null;
+        var router = this.model.buttons.find((v) => {
+          return v.id === field.id;
+        });
+        if (router == undefined) {
+          router = this.model.links.find((v) => {
+            return v.id === field.id;
+          });
+        }
+        if (router == undefined) {
+          router = this.model.actionRouters.find((v) => {
+            return v.id === field.id;
+          });
+        }
+        if (router && field.isSubmitDataFromSelf) {
+          submitData = {};
+          router.submitFormField.forEach((v) => {
+            submitData[v] = field.list[field.listIndex].code;
+          });
+        }
+        this.$parent.$parent.$parent.$parent.clickHandler(router, submitData);
+      },
     }
   }
 </script>

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -261,6 +261,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -402,6 +402,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

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

@@ -217,7 +217,18 @@
                         </div>
                     </div>
                     <div v-else class="el-tabs__content" :key="model.tags2Key">
-                      <div v-for="(m, i) in col.list" class="text" :key="i">{{m.dutyEmpName}}</div>
+                      <div v-if="col.list" role="tabpanel" aria-labelledby="tab-first" class="el-tab-pane">
+                        <div v-for="(info, i) in col.list" :key="i" class="tab-conten">
+                          <img :src="info.dutyEmpUrl">
+                          <div class="user-name" style="display: block;padding-top: 5px;">
+                            <div style="display: flex;">
+                              <div class="text">{{info.dutyEmpName}}</div>
+                              <span class="user-but">{{info.dutyDeptName}}</span>
+                            </div>
+                            <div class="text">{{info.mobileNo}}</div>
+                          </div>
+                        </div>
+                      </div>
                     </div>
                   </el-tab-pane>
                 </el-tabs>
@@ -587,6 +598,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

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

@@ -401,6 +401,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

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

@@ -402,6 +402,9 @@
               else if (field.isOpenUrlInBrowse) {// 浏览器打开
                 window.open(submitData[field.submitFormField], "_blank");
               }
+              else if (field.isSeeVoice) {//看视频              
+                self.$common.browseVideo(field,submitData)
+              }
               else if (field.isExport) {
                 submitData = field.getActionPara(submitData).para;
                 self.model.export(field, submitData);

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

@@ -64,7 +64,7 @@
         }
         this.loadFields();
         this.$nextTick(() => {
-          this.$refs.table.searchComplate(this.model);
+          this.$refs.table.searchComplate(this.model,this.model.flagSearch);
         });
         this.loading = false;
         

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

@@ -182,9 +182,10 @@
           c.width = (c.maxLen + 2) * 6;
         });
       },
-      searchComplate(searchModel) {
+      searchComplate(searchModel,flagSearch) {
         var self = this;
         this.loading = true;
+        if(flagSearch==undefined)flagSearch=true;
         this.$nextTick(function () {
           if (typeof self.api !== 'undefined' && typeof searchModel !== 'undefined') {
             var postData;
@@ -205,7 +206,9 @@
               }
               postData.fields.push(retains);
             }
-            self.loaderObj.SearchTable(self.api, self.load, searchModel, true, postData);
+            self.loaderObj.SearchTable(self.api, self.load, searchModel, flagSearch, postData,function(){
+              self.loading = false;
+            });
           }
           if (typeof self.source !== 'undefined') {
             self.load(self.loaderObj.SearchTable(self.source));

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

@@ -554,10 +554,14 @@
                 h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;
               }
               var h3 = 0;
-              if (this.$parent.$parent.$refs.contact) {
+              if (this.$parent.$parent.$refs.title) {
                 h3 = this.$parent.$parent.$refs.title.offsetHeight | 0;
               }
-              let tableHeight = h1 - h2 - h3 - 270;
+              var h4 = 0;
+              if (this.$parent.$parent.$refs.shortcutFollow) {
+                h4 = this.$parent.$parent.$refs.shortcutFollow.offsetHeight | 0;
+              }
+              let tableHeight = h1 - h2 - h3-h4 - 290;
               if (h2 == 0) {
                 tableHeight = tableHeight + 15;
               }
@@ -753,6 +757,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else {
               //self.operationLoading = true;
 
@@ -934,6 +941,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else {
               //self.operationLoading = true;
 

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

@@ -6,7 +6,7 @@ import Router from './Router';
 import Enum from './lib/Enum';
 import Vue from 'vue';
 
-const Compound = function (source, dateType) {
+const Compound = function (source, sourceParent) {
   var rtn = {
     get label() {
       let l = '';
@@ -18,9 +18,63 @@ const Compound = function (source, dateType) {
       }
       return l;
     },
+    isChanged: false,
     set label(v) {
       source.controlLabel = v;
     },
+    _buttons: null,
+    get buttons() {
+      if (rtn._buttons !== null) {
+        return rtn._buttons;
+      }
+      else {
+        rtn._buttons = [];
+        if (sourceParent.buttons) {
+          sourceParent.buttons.forEach((v) => {
+            var button = Router(v);
+            button.is = "ct-btn";
+            rtn._buttons.push(button);
+          });
+        }
+        return rtn._buttons;
+      }
+    },
+    _links: null,
+    get links() {
+      if (rtn._links !== null) {
+        return rtn._links;
+      }
+      else {
+        rtn._links = [];
+        if (sourceParent.links) {
+          sourceParent.links.forEach((v) => {
+            var button = Router(v);
+            button.is = "ct-btn";
+            if (button.show) {
+              rtn._links.push(button);
+            }
+          });
+        }
+        return rtn._links;
+      }
+    },
+    _actionRouters: null,
+    get actionRouters() {
+      if (rtn._actionRouters !== null) {
+        return rtn._actionRouters;
+      }
+      else {
+        rtn._actionRouters = [];
+        if (sourceParent.actionRouters) {
+          sourceParent.actionRouters.forEach((v) => {
+            var button = Router(v);
+            button.is = "ct-btn";
+            rtn._actionRouters.push(button);
+          });
+        }
+        return rtn._actionRouters;
+      }
+    },
     getFormObj() {
       var rtnFormObj = {};
       rtn.fields.forEach((f) => {
@@ -30,6 +84,20 @@ const Compound = function (source, dateType) {
       });
       return rtnFormObj;
     },
+    _compoundfieldsDic: null,//字典，方便取值
+    get compoundfieldsDic() {
+      if (rtn._compoundfieldsDic !== null) {
+        return rtn._compoundfieldsDic;
+      }
+      rtn._compoundfieldsDic = {};
+      if (source.compoundFields) {
+        source.compoundFields.forEach((f) => {
+          let item = LibFunction.GetControl(f, sourceParent, false, false);
+          rtn._compoundfieldsDic[item.id] = item;
+        });
+      }
+      return rtn._compoundfieldsDic;
+    },
     _fields: null,//数组，方便遍历 
     get fields() {
       if (rtn._fields !== null) {
@@ -37,21 +105,104 @@ const Compound = function (source, dateType) {
       }
       let Index = 0;
       rtn._fields = [];
-      for (var key in source.compoundFields) {
-        let value = source.compoundFields[key];
+      source.compoundFields.forEach((v) => {
         Index++;
         let showLabel = true;
-        let item = LibFunction.GetControl(value, source, showLabel, false);
+        let item = LibFunction.GetControl(v, sourceParent, showLabel, false);
         if (item instanceof Object) {
+          item.width = v.width;
           item.form = rtn;
           if (Index == 1 && item.label == "") {
             item.label = rtn.label;
           }
+          rtn.hiddenHandle(item);//是否隐藏关联组件
           rtn._fields.push(item);
         }
-      }
+      });
+      rtn.allRequiredHandle();//必填关联组件
       return rtn._fields;
     },
+    //隐藏关联组件
+    hiddenHandle(item, update) {
+      if (item.id) {
+        let sign = false;
+        let field = null;
+
+        for (var i in source.compoundFields) {
+          if (source.compoundFields[i].hiddenRelationField === item.id) {
+            field = source.compoundFields[i];
+            if (field) {
+              let hiddenValueArr = field.hiddenRelationFieldValue.split(',');
+              if (hiddenValueArr.indexOf(item.code1) > -1) {
+                field.show = false;
+              }
+              else {
+                field.show = true;
+              }
+              sign = true;
+
+              if (update && rtn.self && sign) {
+                rtn.self.$forceUpdate();
+              }
+            }
+          }
+        }
+
+      }
+    },
+    //验证必填关联组件
+    validMrf(item) {
+      let field = rtn.fields[item.mrf];
+
+      if (field && field.self) {
+        if (field.type === Enum.ControlType.List) {
+          //f.required = '0';
+        }
+        else {
+          field.self.validExcute();
+        }
+      }
+    },
+    allRequiredHandle() {
+      rtn.fields.forEach(v => {
+        rtn.requiredHandle(v, null, false);
+      });
+    },
+    //处理必填关联组件
+    requiredHandle(item, update, doMrf) {
+      if (item.id) {
+        let field = null;
+        for (var i in source.compoundFields) {
+          if (source.compoundFields[i].requiredRelationField === item.id) {
+            field = source.compoundFields[i];
+            let f = rtn.compoundfieldsDic[field.fieldName1];
+
+            if (field) {
+              let hiddenValueArr = field.requiredRelationFieldValue.split(',');
+              if (hiddenValueArr.indexOf(item.value) > -1) {
+                field.required = true;
+              }
+              else {
+                field.required = false;
+              }
+
+              if (f && f.self && f.self.$forceUpdate) {
+                f.self.$forceUpdate();
+              }
+
+              if (update && rtn.self) {
+                rtn.self.$forceUpdate();
+              }
+            }
+          }
+        }
+
+        if (doMrf !== false) {
+          rtn.validMrf(item);
+        }
+      }
+    },
+   
   };
   rtn = base.copy(Base(source), rtn);
   return rtn;