centaline-data-driven 1.2.47 → 1.2.50

package/package.json

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

package/src/centaline/css/common.css

@@ -800,4 +800,7 @@ html {
 }
 .el-input-group{
   line-height: 26px;
-}
+}
+
+
+

package/src/centaline/css/max.css

@@ -108,6 +108,9 @@
     min-height: 26px;
     line-height: 25px;
 }
+.ct-checkbox .lableNaN{
+    padding-left: 3px!important;
+}
 .cover-list-item .el-checkbox{
     margin-right: 10px!important;
 }

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -5,7 +5,7 @@
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
           {{model.label}}
         </div>
-        <div class="ct-checkbox-mian cover-list-item" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
+        <div class="ct-checkbox-mian cover-list-item" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'',model.label?'':'lableNaN']">
           <el-checkbox-group v-model="model.checkedItemArr" @change="changeHandler1">
             <el-checkbox :disabled="model.lock" v-for="item in model.options" :label="item[model.optionAttrs.value]" :key="item[model.optionAttrs.value]">{{item[model.optionAttrs.label]}}</el-checkbox>          
             <span v-if="!model.lock" class="cover-list-item-span max-cover-list-item">

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

@@ -2,17 +2,20 @@
     <div>
       <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" class="ct-PropertyDetailOFI"  v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
       <ct-PropertyDetailRET :api="api" :apiParam="apiParam" class="ct-PropertyDetailRET"  v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
+      <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" class="ct-PropertySimpleDetailRET"  v-if="pageType=='PropertySimpleDetailRET'"></ct-PropertySimpleDetailRET>
     </div>
 </template>
 
 <script>
   import dynamicPropertyDetailOFI from './dynamicPropertyDetailOFI'
   import dynamicPropertyDetailRET from './dynamicPropertyDetailRET'
+  import dynamicPropertySimpleDetailRET from './dynamicPropertySimpleDetailRET'
   export default {
     name: 'ct-Detail',
     components: {
       'ct-PropertyDetailOFI': dynamicPropertyDetailOFI,
       'ct-PropertyDetailRET': dynamicPropertyDetailRET,
+      'ct-PropertySimpleDetailRET': dynamicPropertySimpleDetailRET,
     },
     props: {
       vmodel: Object,

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

@@ -0,0 +1,316 @@
+<template>
+    <div ref="main" class="main">
+      <div style="height:36px;margin-top: 10px;display: flex;">        
+        <img src="../../../assets/ewmA.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:22px">
+        <span :style="{'width':computedTopWidth}"></span>
+        <img src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-right:11px">
+        <img src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-right:8px">
+        <div class="el-icon-close"></div>
+      </div>
+      <div v-if="model!==null">
+        11111111111111111111111
+      </div>
+    </div>
+</template>
+
+<script>
+  import dynamicElement from '../../mixins/dynamicElement';
+  export default {
+    name: 'ct-PropertySimpleDetailRET',
+    mixins: [dynamicElement],
+    components: {
+    },
+    props: {
+      vmodel: Object,
+      api: String,
+      apiParam: Object,
+    },
+    computed: {
+      computedTopWidth(){
+        // debugger
+        // let w=this.$refs.main.clientWidth;
+        // let wt=w-140;
+        return 300+'px';
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    mounted() {
+      var self = this;
+      this.$nextTick(function () {
+        if (self.vmodel) {
+          self.load(self.vmodel);
+        }
+        else if (typeof self.source !== 'undefined') {
+          self.loaderObj.Detail(self.source,null,self.load);
+        }
+        else if (typeof self.api !== 'undefined' && self.apiParam) {
+          self.loaderObj.Detail(self.api,self.apiParam, self.load);
+        }
+      });
+    },
+    activated() {
+      this.$nextTick(() => {
+        this.setDetailHeight();
+      })
+    },
+    methods: {
+      load(data) {
+        var self = this;
+        this.model = data; 
+        this.model.$vue = self;
+        this.loadFields();
+        if(this.model.tags2 && this.model.tags2[0]){
+          this.model.getTags2List(0);
+        }
+        this.loadOperation();
+        this.loadCommission();
+        this.setDetailHeight();
+        this.$nextTick(() => {
+          window.addEventListener("resize", (ev) => {
+            self.setDetailHeight();
+          });
+        });
+      },
+      loadFields() {
+        var self = this;
+        self.collapse=[];
+        var collapseItemArr = [];
+        var col=0;
+        var colCount=4;
+        self.model.fields2Dic.forEach((v, index) => {
+          if(v.type===13){
+            collapseItemArr = [];
+            col=0;
+          }
+          else if(v.singleLine){
+            if(collapseItemArr.length>0){
+              self.collapse.push(collapseItemArr);
+              collapseItemArr = [];
+            }
+            collapseItemArr.push(v);
+            self.collapse.push(collapseItemArr);
+            collapseItemArr = [];
+            col=0;
+          }
+          else if(v.spanCols){
+            collapseItemArr.push(v);
+            col=col+v.spanCols;
+            if(col===colCount || index===self.model.fields2Dic.length-1){
+              self.collapse.push(collapseItemArr);
+              collapseItemArr = [];
+              col=0;
+            }
+          }
+          else{
+            collapseItemArr.push(v);
+            col=col+1;
+            if(col===colCount || index===self.model.fields2Dic.length-1){
+              self.collapse.push(collapseItemArr);
+              collapseItemArr = [];
+              col=0;
+            }
+          }
+        });
+      },
+      loadOperation() {
+        this.model._operationList=null;        
+        this.model._operationRouters=[];
+        this.model.getOperationList();
+      },
+      loadCommission() {
+        this.model.getCommissionList();
+      },
+      lookOwner() {
+        this.codeOwner = true
+      },
+      handleClick(tab, event) {
+        let i=tab.index;
+        if(this.model.tags2 && this.model.tags2[i]){
+          this.model.getTags2List(i);
+        }
+      },
+      setDetailHeight() {
+        this.$nextTick(() => {
+          if (this.$refs.detail && this.$refs.main) {
+            
+          }
+        });
+      }, 
+      handleSelect(key, keyPath) {
+        let i=key.index;
+        this.model.activeIndex1=i;
+        if(this.model.tags1 && this.model.tags1[i]){
+          this.model.searchlistKey=this.model.searchlistKey+1;
+          this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
+          this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
+          this.model.paramDataTags1=this.model.tags1[i].paramData||'';
+        }
+      },      
+      fieldClickHandler(field) {
+        var self = this;
+        var callBack=null;
+        let submitData={};
+        var router = this.model.actionRouters.find((v) => {
+          return v.id === field.id;
+        });
+        if(router==undefined && this.model.actionRoutersMoreList){
+          router = this.model.actionRoutersMoreList.find((v) => {
+            return v.id === field.id;
+          });
+        }
+        if(router==undefined && this.model.otherTradeActionRouter){
+          if(field.id===this.model.otherTradeActionRouter.id){
+            router = this.model.otherTradeActionRouter
+          }
+        }
+        if(router==undefined && this.model.operationRouters){
+            router = this.model.operationRouters.find((v) => {
+              return v.id === field.id;
+            });
+            callBack="loadOperation";
+        }
+
+        if(router){
+          if(field.isSubmitDataFromSelf){
+            router.submitFormField.forEach((v) => {
+              submitData[v] = field.list[field.listIndex].code;
+            });
+          }
+          else{
+            router.submitFormField.forEach((v) => {
+              submitData[v] = self.model.fields1Dic[v].value;
+            });
+          }
+        }
+
+        if(callBack && callBack=='loadOperation'){
+          this.routerClickHandler(router,submitData,self.loadOperation);  
+        }
+        else{
+          this.routerClickHandler(router,submitData);
+        }
+      },
+      routerClickHandler(field, submitData,callBack) {
+        var self = this;
+        // this.model.scripts.$fd = field.id;
+        // this.model.scripts.$result = [];
+        
+        var clickAcion = function (field) {
+          //若不是客户端方法，则直接访问接口
+          if (!field.isClientFuntion) {
+            // if (typeof field.onClick !== 'undefined') {
+            //   verified = self.$common.excute.call(self.model.scripts, field.onClick);
+            // }
+            
+            if (field.isOpenForm) {
+              var dialogOption = {
+                title: field.pageTitle,
+                pane: self.$common.getParentPane(self),
+                content: [{
+                  component: 'ct-form',
+                  attrs: {
+                    api: field.action,
+                    apiParam: field.getActionPara(submitData).para,
+                    showTitle: false,
+                    width: field.dialogWidth + 'px',
+                    height: field.dialogHeight + 'px'
+                  },
+                  on: {
+                    submit(ev) {
+                      self.model.doAction(ev,field);
+                      if(callBack){
+                        callBack();
+                      }
+                      self.$common.closeDialog(dialogOption.dialog);
+                    }
+                  }
+                }]
+              };
+              self.$common.openDialog(dialogOption);
+            }
+            else if (field.isOpenList) {
+              var dialogOption = {
+                title: field.pageTitle,
+                pane: self.$common.getParentPane(self),
+                content: [{
+                  component: 'ct-searchlist',
+                  attrs: {
+                    searchConditionApi: field.actionForSearchLayout,
+                    searchDataApi: field.actionForSearch,
+                    apiParam: submitData,
+                    width: field.dialogWidth + 'px',
+                    height: field.dialogHeight + 'px'
+                  },
+                  on: {
+                    submit(ev) {
+                      self.model.updateFields(ev, () => {
+                        self.$refs.Fields.forEach((fd) => {
+                          fd.$forceUpdate();
+                        });
+                      });
+                      self.$common.closeDialog(dialogOption.dialog);
+                    }
+                  }
+                }]
+              };
+              self.$common.openDialog(dialogOption);
+            }
+            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
+            }
+            else if (field.isBrowserNewTab) {// 浏览器打开
+              submitData = field.getActionPara(submitData).para;
+              let query = self.$common.objectToQueryStr(submitData);
+              window.open(field.action + query, "_blank");
+            }
+            else{
+              field.doAction(submitData, (data) => {
+                self.model.doAction(data,field);
+                if(callBack){
+                  callBack();
+                }
+              })
+            }
+          }
+          //执行客户端脚本
+          else {
+            submitData = field.getActionPara(submitData).para;
+            let title=field.pageTitle==undefined ?field.label:field.pageTitle;
+            submitData.actionType=field.actionType;
+            var fun =self.$common.getDataDrivenOpts().handler[field.action];
+            fun(submitData,title,self.model);
+          }
+        }
+
+        if (field.isSubmit && !self.validExcute()) {
+          return;
+        }
+
+        if (field.alert) {
+          self.$common.confirm(field.alertMsg, field.alertCaption, {
+            confirmButtonText: field.alertOKButtonText,
+            cancelButtonText: field.alertCancelButtonText,
+            //type: 'warning'
+            center: field.alertCenter
+          }).then(() => {
+            clickAcion(field,submitData);
+          }).catch(() => {
+          });
+        }
+        else {
+          clickAcion(field,submitData);
+        }
+      },
+    }
+  }
+</script>
+<style lang="scss" scoped>
+
+</style>
+
+

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

@@ -17,9 +17,9 @@
       @showTitle="showTitleHandler"></ct-searchtable>
     </div>
     <div v-if="flagSideBar && flagSideBarOfData" 
-    :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:this.sideBarRight+'px'}" 
+    :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
     class="sidebar">
-      <div>1111111111111111111111111111111111</div>
+      <ct-Detail :api="sideBarApi" :apiParam="sideBarApiParam" :pageType="sideBarPageType"></ct-Detail>
       <ct-SearchSideMenu :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus" 
       @sideMenuClickHandler="sideMenuClickHandler"></ct-SearchSideMenu>
     </div>
@@ -40,7 +40,8 @@
       'ct-searchtable': dynamicSearchTable,
       'ct-progress': progress,
       'ct-searchcategory': dynamicSearchCategory,
-      'ct-SearchSideMenu': dynamicSearchSideMenu
+      'ct-SearchSideMenu': dynamicSearchSideMenu,
+      'ct-Detail': ()=>import('../../dynamicDetail/src/dynamicDetail.vue'),
     },
     props: {
       vmodel: Object,
@@ -91,6 +92,10 @@
         sideBarRight:0,
         sideBarMenuRight:0,
         sideBarStatus:'',
+        sideBarStatus:'',
+        sideBarApi:'',
+        sideBarApiParam:null,
+        sideBarPageType:'',
       }
     },
     methods: {
@@ -124,7 +129,7 @@
       },
       searchComplate() {
         this.pageDisabled=false;
-        if(this.$refs.table.model.listData.length>0){
+        if(this.flagSideBar && this.$refs.table.model.listData.length>0){
           if(!this.flagSideBarOfData){
             this.flagSideBarOfData=true;
             this.sideMenuClickHandler(this.sideBarStatus =='close'?'open':'close');
@@ -165,13 +170,24 @@
         if(this.$refs.table.model.listData.length>0){
           this.flagSideBar=this.$refs.table.model.flagSideBar;
           this.flagDefaultDisplaySideBar=this.$refs.table.model.flagDefaultDisplaySideBar;
-          this.sideBarWidth=this.$refs.table.model.sideBarWidth;
+
+          if(this.$refs.table.model.rowSelectRouter){
+            this.sideBarApi=this.$refs.table.model.rowSelectRouter.action;
+            this.sideBarPageType=this.$refs.table.model.rowSelectRouter.actionSource;
+          }
+          else{
+            this.flagSideBar=false;
+          }
+
           if(this.flagSideBar){
-            if(this.flagDefaultDisplaySideBar){
+            if(this.flagDefaultDisplaySideBar && !this.sideBarStatus){
               this.sideMenuClickHandler('close');
             }
-            else{              
-              this.sideMenuClickHandler('open');
+            else{
+              let status='open';
+              if(this.sideBarStatus=='open')status='close';
+              else if(this.sideBarStatus=='close')status='open';
+              this.sideMenuClickHandler(status);
             }
           }
         }
@@ -180,12 +196,14 @@
         if(v=='open'){
           this.sideBarStatus ='close';
           this.sideBarRight=-this.sideBarWidth;
+          this.sideBarWidth=0;
           this.searchWidth=0;
           this.sideBarMenuRight=0;
         }
         else if(v=='close'){
           this.sideBarStatus ='open';
           this.sideBarRight=0;
+          this.sideBarWidth=this.$refs.table.model.sideBarWidth;
           this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
           this.sideBarMenuRight=this.sideBarWidth-2;
         }

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

@@ -93,7 +93,7 @@
                     v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true"
                     :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
-                  <el-popover :ref="'popover'+rowindex" :append-to-table="option.appendId?option.appendId:''" class="Stats-popover" popper-class="el-popover1"
+                  <el-popover v-if="getRowRouterDisplay(row).length>0" :ref="'popover'+rowindex" :append-to-table="option.appendId?option.appendId:''" class="Stats-popover" popper-class="el-popover1"
                     :placement="option.placement?option.placement:'left'" 
                     :trigger="option.trigger?option.trigger:''">
                     <div class="tab-list" style="border-bottom:none">

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

@@ -25,7 +25,14 @@ const Base = function (source) {
       source.fieldName2 = v;
     },
     get label() {
-      return source.controlLabel + this.labelDelimiter || '';
+      let l='';
+      if(source.controlLabel){
+        l=source.controlLabel;
+      }
+      if(source.labelDelimiter){
+        l=l+source.labelDelimiter;
+      }
+      return l;
     },
     set label(v) {
       source.controlLabel = v;

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

@@ -23,6 +23,9 @@ const Router = function (source) {
     get actionForSearch() {
       return source.actionForSearch;
     },
+    get actionSource() {
+      return source.actionSource;
+    },
     get onClick() {
       return source.onChanged;
     },

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

@@ -378,6 +378,18 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           return rtn._rowRouter;
         }
       },
+      _rowSelectRouter: null,
+      get rowSelectRouter() {
+        if (rtn._rowSelectRouter !== null) {
+          return rtn._rowSelectRouter;
+        }
+        else {
+          if (source.content.rowSelectRouter && source.content.rowSelectRouter.key) {
+            rtn._rowSelectRouter=Router(source.content.rowSelectRouter);
+          }
+          return rtn._rowSelectRouter;
+        }
+      },
       sortData: [],
       toSort: function (col, action, callback) {
         this.columns.forEach((v1) => {