centaline-data-driven 1.1.49 → 1.1.53

package/package.json

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

package/src/Form.vue

@@ -7,7 +7,8 @@
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <!-- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'Worklist/getLayoutOfAudit'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -22,7 +23,8 @@
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {SN: "13557_132", UserID: "wuhan3"},
         // apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
-        apiParam: {chanceID: "1", actionType: 2} ,
+        // apiParam: {chanceID: "1", actionType: 2} ,
+        apiParam: {worklistID: "1491261975253094400", actionType: 2}
         // apiParam: {
         //   actionType: 2,
         //   agentId: "1450283160825425922",

package/src/centaline/css/common.css

@@ -315,7 +315,7 @@ html {
  }
  .spanMessage {
    font-size: 12px;
-   padding: 3px 2px;
+   padding: 2px 2px;
  }
  .el-input__icon {
    height:initial;
@@ -734,5 +734,10 @@ html {
   min-height: 26px!important;
 }
 .ct-dialog_body .el-card__body{
-  padding-top: 0px!important;
+  padding: 0px 3px 10px 10px!important;
 }
+.ct-text .ct-font-size-mini span{
+  display: inline-block;
+  margin-top: 1px;
+  color: #388cd3;
+}

package/src/centaline/css/max.css

@@ -43,18 +43,18 @@
     border-radius: 6px;
 }
 /* 弹层新增按钮 */
-.max-btn-add button{ /*list-button*/
+.max-btn-add button,.max-btn-add{ /*list-button*/
     height: 26px;
     background: #EE6B6B;
     border-color:#EE6B6B;
     box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
     border-radius: 6px;
 }
-.max-btn-add button:hover{
+.max-btn-add button:hover,.max-btn-add:hover{
     background-color:#FF9393;
     border-color: #FF9393;
 }
-.max-btn-add button:focus,.max-btn-add button:active{
+.max-btn-add button:focus,.max-btn-add button:active,.max-btn-add:focus,.max-btn-add:active{
     background-color: #B33136;
     border-color: #B33136;
 }
@@ -168,13 +168,13 @@
     text-align: left !important;
   }
 /* 重置input默认颜色 选中文字颜色 */
-  .ct-search-list input::-webkit-input-placeholder{
+  .ct-search-list input::-webkit-input-placeholder,.ct-iti-editor input::-webkit-input-placeholder{
       color: #666666!important;
   }
   .ct-search-list .el-date-editor .el-range-input,.ct-search-list .el-input__inner{
       color: #409eff;
   }
-  .ct-so .ct-input_inner {
+  .ct-so .ct-input_inner,.ct-text .showLabel input{
     color: #409eff!important;
   }
   .cover-list-item .el-checkbox__input.is-checked + .el-checkbox__label,.cover-list-item .el-checkbox__input.is-checked .el-checkbox__inner{
@@ -201,4 +201,8 @@
   .ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
     min-height: 26px;
     line-height: 26px;
-}
+}
+.el-input-group__append, .el-input-group__prepend {
+    color: #666;
+    border-color:#cecece;
+  }

package/src/centaline/dialogList/src/dialog.vue

@@ -56,10 +56,12 @@
               style: {
                 'z-index': this.zindex,
                 //'wiidth': (this.vmodel.pane ? this.vmodel.pane.$el.offsetWidth : document.body.offsetWidth) + 'px',
-                'height': (self.vmodel.pane ? self.vmodel.pane.$el.offsetHeight : document.body.offsetHeight + 10) + 'px',
+                // 'height': (self.vmodel.pane ? self.vmodel.pane.$el.offsetHeight : document.body.offsetHeight + 10) + 'px',
+                'height':'100%',
                 'width': '100%',
                 // 'height': '100%',
               }
+              
             }, [
                 //h('div', {
                 //  'class': [
@@ -148,9 +150,10 @@
                                       ph=parseInt(item.attrs.height.replace('px',''));
                                     }
                                     if(self.vmodel.pane && self.vmodel.pane.$el.offsetHeight<ph){
-                                      item.attrs.height=(self.vmodel.pane.$el.offsetHeight-20)+'px';
+                                      item.attrs.height=(self.vmodel.pane.$el.offsetHeight-30)+'px';
                                     }
-
+                                    // console.log(document.body.offsetHeight);
+                                    // console.log(item.attrs.height)
                                     return h('div', {
                                       style: {
                                         width: item.attrs.width,

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

@@ -144,9 +144,7 @@
                     <div class="row-i"><span>装修：</span><span>豪装</span></div>
                     <div class="row-i"><span>租赁期：</span><span>半年</span></div>
                     <div class="row-i"><span>付款方式：</span><span>一次性全款</span></div>
-                    <div class="row-i">
-                      <span>可否注册公司：</span><span>是</span>
-                    </div>
+                    <div class="row-i"><span>可否注册公司：</span><span>是</span></div>
                   </div>
               </div>
               <div class="info-conten-b" v-show="allInfo">

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -19,7 +19,7 @@
       <div slot="file" slot-scope="{file}" :title="file.fileName">
         <div class="cover-list-item">
           <el-image fit="fill" :src="file.url"
-                    style="width: 150px; height: 150px"
+                    style="width: 100px; height: 100px"
                     :preview-src-list="getPreviewSrcList(file)"
                     :z-index="previewZIndex"
                     @click="handlePictureCardPreview(file)">
@@ -229,9 +229,12 @@
 <style>
   .ct-upload-display-none .el-upload--picture-card {
     display: none; 
+     
   }
-
-  .ct-file .cover-list-item {
+.el-upload-list__item .is-ready{
+  width: 100px;
+    height: 100px;
+}  .ct-file .cover-list-item {
     position: sticky;
   }
 
@@ -261,12 +264,20 @@
   .ct-file .el-icon-arrow-down {
     font-size: 12px;
   }
+  .el-collapse-item__content{
+    padding-bottom: 18px;
+  }
   .el-upload--picture-card{
-    width: 120px;
-    height: 120px;
-    line-height: 120px;
+    width: 100px;
+    height: 100px;
+    line-height:initial;
+    padding: 34px;
   }
   .el-upload--picture-card i{
-    font-size: 34px;
+    font-size: 30px;
+  }
+  .el-upload-list--picture-card .el-upload-list__item{
+    width: 100px;
+    height: 100px;
   }
 </style>

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

@@ -217,6 +217,16 @@
         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;
+          });
+        }
         this.clickHandler(router);
       },
       clickHandler(field, submitData) {
@@ -224,61 +234,139 @@
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
         
-        var clickAcion = function (field) {  
-          if (field.isSubmit) {
-            let verified = true;
-            if (self.validExcute()) {
+        var clickAcion = function (field) {
+          //若不是客户端方法，则直接访问接口
+          if (!field.isClientFuntion) {
+            if (field.isSubmit) {
+              let verified = true;
+              if (self.validExcute()) {
+                if (typeof field.onClick !== 'undefined') {
+                  verified = self.$common.excute.call(self.model.scripts, field.onClick);
+                }
+
+                if (verified) {
+                  //action有值，提交到后台
+                  if (field.action) {
+                    field.disabled = true;//提交按钮禁用
+                    self.model.pageDisabled= true;
+                    field.doAction(self.getFormObj(), (data) => {
+                      if (data.rtnCode === 200) {
+                        if (self.model.flagAlertClose) {
+                          self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                          }).then(() => {
+                            //如果没有弹框 则关闭tab页
+                            if (self.$common.dialogList && self.$common.dialogList.List.length === 0) {
+                              if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
+                                self.$common.getDataDrivenOpts().handler.closeTab();
+                              }
+                            }
+                            self.$emit('submit', { formData: self.model, responseData: data });
+                          }).catch(() => {
+                            self.init();
+                          });
+                        }
+                        else {
+                          self.$emit('submit', { formData: self.model, responseData: data });
+                        }
+                        if (self.parentModel) {
+                          self.parentModel.$vue.closeTabThen(data);
+                        }
+                      }
+                      field.disabled = false;                    
+                      self.model.pageDisabled= false;
+                    });
+                  }
+                  //无值，触发submit事件
+                  else {
+                    self.$emit('submit', { formData: self.model, responseData: {} });
+                  }
+                }
+              }
+            }
+            else {
               if (typeof field.onClick !== 'undefined') {
                 verified = self.$common.excute.call(self.model.scripts, field.onClick);
               }
 
-              if (verified) {
-                //action有值，提交到后台
-                if (field.action) {
-                  field.disabled = true;//提交按钮禁用
-                  self.model.pageDisabled= true;
-                  field.doAction(self.getFormObj(), (data) => {
-                    if (data.rtnCode === 200) {
-                      if (self.model.flagAlertClose) {
-                        self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
-                          confirmButtonText: '确定',
-                          cancelButtonText: '取消',
-                          type: 'warning'
-                        }).then(() => {
-                          //如果没有弹框 则关闭tab页
-                          if (self.$common.dialogList && self.$common.dialogList.List.length === 0) {
-                            if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
-                              self.$common.getDataDrivenOpts().handler.closeTab();
-                            }
-                          }
-                          self.$emit('submit', { formData: self.model, responseData: data });
-                        }).catch(() => {
-                          self.init();
+              if (!submitData) {
+                submitData = {};
+                var tempFormData = self.model.getFormObj();
+                field.submitFormField.forEach((v) => {
+                  submitData[v] = tempFormData[v];
+                });
+              }
+
+              if (field.isOpenForm) {
+                var dialogOption = {
+                  title: field.pageTitle,
+                  pane: self.$common.getParentPane(self),
+                  content: [{
+                    component: 'ct-form',
+                    attrs: {
+                      //ssource: data.content,
+                      api: field.action,
+                      apiParam: field.getActionPara(submitData).para,
+                      showTitle: false,
+                      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);
                       }
-                      else {
-                        self.$emit('submit', { formData: self.model, responseData: data });
-                      }
-                      if (self.parentModel) {
-                        self.parentModel.$vue.closeTabThen(data);
+                    }
+                  }]
+                };
+                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);
                       }
                     }
-                    field.disabled = false;                    
-                    self.model.pageDisabled= false;
-                  });
-                }
-                //无值，触发submit事件
-                else {
-                  self.$emit('submit', { formData: self.model, responseData: {} });
-                }
+                  }]
+                };
+                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 {
-            if (typeof field.onClick !== 'undefined') {
-              verified = self.$common.excute.call(self.model.scripts, field.onClick);
-            }
-
             if (!submitData) {
               submitData = {};
               var tempFormData = self.model.getFormObj();
@@ -286,71 +374,11 @@
                 submitData[v] = tempFormData[v];
               });
             }
-
-            if (field.isOpenForm) {
-              var dialogOption = {
-                title: field.pageTitle,
-                pane: self.$common.getParentPane(self),
-                content: [{
-                  component: 'ct-form',
-                  attrs: {
-                    //ssource: data.content,
-                    api: field.action,
-                    apiParam: field.getActionPara(submitData).para,
-                    showTitle: false,
-                    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.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");
-            }
+            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);
           }
         }
 
@@ -410,12 +438,12 @@
         var self = this;
         var submitData = {};
         var tempFormData = self.model.getFormObj();
+
         var check = true;
         var checkMsg;
         router.submitFormField.forEach((v) => {
           submitData[v] = tempFormData[v];
-
-          if (typeof tempFormData[v] === "undefined" || tempFormData[v] === '') {
+          if (typeof tempFormData[v] === "undefined") {
             if (self.model.fieldsDic[v]) {
               checkMsg = "请先录入" + self.model.fieldsDic[v].label;
             }

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding:0 8px 0 10px">
     <div v-if="model !== null && !loading">
       <el-table ref="multipleTable"
                 :data="tableData"
@@ -233,5 +233,7 @@
   }
   .el-table .el-table__header th {
     background-color: #f4f7fa!important;
+    padding-left: 5px;
+    padding-right: 5px;
   }
 </style>

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

@@ -684,7 +684,9 @@
                     },
                     on: {
                       submit(ev) {
-                        self.model.doAction(ev);
+                        if (!field.flagFreshCurrentRow) {
+                          self.model.doAction(ev);
+                        }
                         self.$forceUpdate();
                         self.$refs.footer.$forceUpdate();
                         self.$common.closeDialog(dialogOption.dialog);

package/src/centaline/dynamicSo/src/dynamicSo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="field-top">
     <div style="width:100%;display:flex;">
-      <div style="flex:1;margin-right:5px" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+      <div style="flex:1;" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
        ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">

package/src/centaline/dynamicSos/src/dynamicSos.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="field-top">
     <div style="width:100%;display:flex">
-      <div style="flex:1;margin-right:5px" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+      <div style="flex:1;" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
        ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -419,7 +419,7 @@
     color: #909399;
   }
   .ct-tags-value-label {
-    padding-left: 15px;
+    /* padding-left: 15px; */
   }
   .h26{
   height: 26px;

package/src/centaline/formData/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import common from '../common';
+import Enum from '../loader/src/ctl/lib/Enum';
 import Axios from 'axios';
 const formData = {
     install(Vue) {
@@ -230,7 +231,7 @@ const formData = {
     //获取后台数据，并返回脚本。
     execServerScript(action, object, successCallback) {
         let formData = this;//作用域保存
-
+debugger;
         //是否是行内触发的
         let data = this.getListField(this.form.scripts.$fd, null, null);
         object.editMode = data ? 1 : 0;

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

@@ -118,6 +118,23 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           return rtn._links;
         }
       },
+      _actionRouters: null,
+      get actionRouters() {
+        if (rtn._actionRouters !== null) {
+          return rtn._actionRouters;
+        }
+        else {
+          rtn._actionRouters = [];
+          if (source.actionRouters) {
+            source.actionRouters.forEach((v) => {
+              var button = Router(v);
+              button.is = "ct-btn";
+              rtn._actionRouters.push(button);
+            });
+          }
+          return rtn._actionRouters;
+        }
+      },
       get optionApi() {
         return source.parameterAction;
       },

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

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const HyperLink = function (source) {
   var rtn = {

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

@@ -146,7 +146,8 @@ const Router = function (source) {
       return source.rightField;
     },
     get submitFormField() {
-      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null) {
+     
+      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null|| source.refFieldName.trim() === '') {
         return [];
       }
       var submitArr = [];
@@ -156,7 +157,7 @@ const Router = function (source) {
       return submitArr;
     },
     get submitListField() {
-      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null) {
+      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null|| source.refFieldName.trim() === '') {
         return [];
       }
       var submitArr = [];

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

@@ -646,7 +646,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           }
         }
       },
-      doAction(response) {       
+      doAction(response) {
         if (response.responseData) {
           response = response.responseData;
         }

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

@@ -29,6 +29,7 @@ const loader = {
   File: require("./ctl/File.js").default,
   Tree: require("./ctl/Tree.js").default,
   SearchCategory: require("./ctl/SearchCategory.js").default,
+  HyperLink: require("./ctl/HyperLink.js").default,
   Detail: require("./ctl/Detail.js").default,
 };