centaline-data-driven 1.1.46 → 1.1.50

package/package.json

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

package/src/Form.vue

@@ -15,7 +15,7 @@
 
 <script>
   export default {
-    name: 'App',
+    name: 'DataDrivenForm',
     data() {
       return {
         // apiParam: {originalTraId: "1481454808274235394", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,

package/src/SearchList.vue

@@ -10,7 +10,7 @@
 <script>
   import Vue from 'vue'
   export default {
-    name: 'App',
+    name: 'DataDrivenSearch',
     data() {
       return {
         //para: { agentId: "1424932685198864386", estateId: "L201402181627000007233", estateName: "271医院宿舍区", pageOnly: "true", pageTitle: "销控房源列表" }

package/src/centaline/common/index.js

@@ -272,6 +272,12 @@ const common = {
       else if (evControl.$options.name === 'ctDialog') {
         return evControl.vmodel.pane;
       }
+      else if (parent.$options.name === 'DataDrivenSearch') {
+        return parent;
+      }
+      else if (parent.$options.name === 'DataDrivenForm') {
+        return parent;
+      }
       else {
         return this.getParentPane(parent);
       }

package/src/centaline/css/common.css

@@ -140,7 +140,7 @@ html {
    right: 0;
    bottom: 0;
    left: 0;
-   overflow: auto;
+   /* overflow: auto; */
    background-color: #000;
    background: rgba(0, 0, 0, 0.5);
    align-items: center;
@@ -234,17 +234,14 @@ html {
    font-size: 14px;
  }
 
-/* 有边框是26，无边框是28*/
  .ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
-   min-height: 28px;
+   min-height: 26px;
    line-height: 26px;
- }
- 
+ } 
  .ct-Seg.ct-Seg-small .ct-radios, .ct-Seg.ct-Seg-small .ct-radios .el-radio__label {
    height: 32px;
    line-height: 32px;
- }
- 
+ } 
  .ct-Seg.ct-Seg-medium .ct-radios, .ct-Seg.ct-Seg-medium .ct-radios .el-radio__label {
    height: 36px;
    line-height: 36px;
@@ -417,9 +414,9 @@ html {
  
  
  /*主要按钮*/
- /* .el-button{
-  border: none;
-} */
+.el-button{
+ height:26px
+}
 /*.el-button:active {
   background-color: #b3caf5;
   border: none;
@@ -431,7 +428,11 @@ html {
   color: #fff;
 
 } */
+ .el-button--mini, .el-button--mini.is-round{
+  padding: 0px 19px;
+}
  .el-button--primary {
+   height: 26px;
    background-color: #EE6B6B ;
    border-color: #EE6B6B ;
  }
@@ -633,8 +634,8 @@ html {
   padding: 0 15px 0 5px;
 } */
 .ct-Seg .ct-radios .el-input__icon.el-icon-circle-close{
-  min-height: 27px;
-  line-height: 27px;
+  min-height: 25px;
+  line-height: 25px;
 
 }
 .list-field .el-input-group__append, .list-field .el-input-group__prepend{
@@ -713,8 +714,9 @@ html {
 .ct-table-content{
   padding: 0 15px;
 }
-.el-card.is-always-shadow{
-  box-shadow: none!important;
+.el-card.is-always-shadow {
+  border: none;
+  box-shadow: none !important;
 }
 
 .domDisabled {
@@ -724,7 +726,13 @@ html {
 .el-radio__label{
   padding-left: 5px!important;
 }
-.el-input--mini .el-input__inner {
+.el-input--mini .el-input__inner{
   height: 26px!important;
   line-height: 26px!important;
- }
+ }
+.ct-rich-text {
+  min-height: 26px!important;
+}
+.ct-dialog_body .el-card__body{
+  padding: 0px 3px 10px 10px!important;
+}

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

@@ -56,9 +56,9 @@
               style: {
                 'z-index': this.zindex,
                 //'wiidth': (this.vmodel.pane ? this.vmodel.pane.$el.offsetWidth : document.body.offsetWidth) + 'px',
-                //'height': (this.vmodel.pane ? this.vmodel.pane.$el.offsetHeight : document.body.offsetHeight + 10) + 'px'
+                'height': (self.vmodel.pane ? self.vmodel.pane.$el.offsetHeight : document.body.offsetHeight + 10) + 'px',
                 'width': '100%',
-                'height': '100%'
+                // 'height': '100%',
               }
             }, [
                 //h('div', {
@@ -143,6 +143,14 @@
                                       }
                                     }
 
+                                    var ph=0;
+                                    if(item.attrs.height){
+                                      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';
+                                    }
+
                                     return h('div', {
                                       style: {
                                         width: item.attrs.width,

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

@@ -34,8 +34,7 @@
       }
     },
     methods: {
-      addDialog(vmodel) {
-        
+      addDialog(vmodel) {        
         vmodel.id = (new Date()).getTime();
         this.List.push(vmodel);
 
@@ -46,8 +45,7 @@
           document.addEventListener("touchmove", mo, false);//禁止页面滑动
         }
       },
-      deleteDialog(model) {
-       
+      deleteDialog(model) {       
         model.dialogTableVisible = false;
         //改成删除
         let index = this.List.findIndex(v => {

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,4 +264,20 @@
   .ct-file .el-icon-arrow-down {
     font-size: 12px;
   }
+  .el-collapse-item__content{
+    padding-bottom: 18px;
+  }
+  .el-upload--picture-card{
+    width: 100px;
+    height: 100px;
+    line-height:initial;
+    padding: 34px;
+  }
+  .el-upload--picture-card i{
+    font-size: 30px;
+  }
+  .el-upload-list--picture-card .el-upload-list__item{
+    width: 100px;
+    height: 100px;
+  }
 </style>

package/src/centaline/dynamicMo/src/dynamicMo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="field-top">
     <div class="ct-mo" style="width:100%;display:flex">
-      <div style="flex:1;display:flex" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-mo-'+model.attrs.size:''
+      <div style="flex:1;display:flex;margin-right: 5px;" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-mo-'+model.attrs.size:''
        ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div style="flex:1;position: relative;" :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]">
@@ -17,7 +17,7 @@
             </span>
           </div>
           <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']"
-                      :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'" :disabled="model.lock">
+                      :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'" :disabled="model.lock">
             <div>
               <ct-select-option :model="model" :optionRowCount="optionRowCount" @click="selectOption($event)"></ct-select-option>
             </div>
@@ -180,20 +180,18 @@
         if (this.model.lock) {
           return false;
         }
-        if (this.model.popupSearchListType === 1) {
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
+        }
+        else if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {
@@ -272,7 +270,12 @@
         var self = this;
         optionArr.forEach((s) => {
           if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
-            self.model.options.push(s);
+            let op={};
+            op[self.model.optionAttrs.value]=s[self.model.optionAttrs.value];
+            op[self.model.optionAttrs.label]=s[self.model.optionAttrs.label];
+            op[self.model.optionAttrs.rowid]='';
+            op[self.model.optionAttrs.flagDeleted]=false;
+            self.model.options.push(op);
             self.model.value.push(s[self.model.optionAttrs.value]);
           }
         });

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

@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" style="width:100%">
     <div v-if="model !== null && !loading" class="ct-form">
-      <div class="ct-ptb5">
+      <div class="ct-ptb5 max-flex">
         <template v-for="(col, index) in model.fields" v-if="col.show !== false">
           <br v-if="col.is === 'ct-linefeed'" />
           <component ref="Fields" :is="col.is" v-bind="col.listBind" :vmodel="col" :api="model.optionApi" @click="getClickHandler(col.action)"></component>
@@ -147,4 +147,11 @@
   }
 </script>
 <style>
+.max-flex{
+  display: flex;
+
+}
+.max-flex .field-top{
+  margin-right: 10px;
+}
 </style>

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

@@ -23,7 +23,7 @@
         <el-input v-if="jumpBtnName" size="mini" v-model="jumpStr" placeholder="定位" style="width:150px"></el-input>
         <el-button v-if="jumpBtnName" size="mini" @click="jumpClickHandler()">{{jumpBtnName}}</el-button>
         <el-button v-if="filterBtnName" size="mini" @click="filterClickHandler()" style="margin-left: 0px;">{{filterBtnName}}</el-button>
-        <el-button size="mini" @click="confirmClickHandler()" style="float:right;" type="primary">确认</el-button>
+        <el-button size="mini" @click="confirmClickHandler()" class="max-search-btn" style="float:right;" type="primary">确认</el-button>
       </div>
     </div>
     <div style="min-height:250px" v-loading="loading" v-if="loading"></div>
@@ -231,4 +231,7 @@
   .el-table {
     font-size: 12px !important;
   }
+  .el-table .el-table__header th {
+    background-color: #f4f7fa!important;
+  }
 </style>

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

@@ -10,7 +10,7 @@
       <div class="ct-radios" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
         <el-radio-group v-model="model.value" @change="changeHandler1($event)">
           <el-radio-button v-bind="model.attrs" v-for="(value, index) in model.segmentValue" :key="index" v-model="model.value"
-                    :label="value[model.optionAttrs.value]" :disabled="model.lock">
+                    :label="value[model.optionAttrs.value]" :displayLabel="value[model.optionAttrs.displayLabel]" :disabled="model.lock">
             {{value[model.optionAttrs.label]}}
           </el-radio-button >
         </el-radio-group>
@@ -61,6 +61,12 @@
         this.changeHandler(this.model.value);
       },
       changeHandler1: function (event) {
+        var self=this;
+        this.model.segmentValue.forEach((v, i) => {
+          if(v[self.model.optionAttrs.value]==event && v[self.model.optionAttrs.displayLabel]){
+            self.model.label=v[self.model.optionAttrs.displayLabel];
+          }
+        });
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
         let parm={};

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

@@ -192,7 +192,7 @@
             self.colHasWidth[vi] = 'nowidth';
           }
         });
-        debugger;
+        
         self.isLoading = false;
         self.$forceUpdate();
         this.model.scripts.formData = this.model.formData;
@@ -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,13 +1,13 @@
 <template>
   <div class="field-top">
-    <div style="width:100%;display:flex">
-      <div style="flex:1" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+    <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:''
        ]" @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]">
             {{model.label}}
           </div>
-          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
+          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'">
             <div>
               <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
             </div>
@@ -165,20 +165,18 @@
         if (this.model.lock) {
           return false;
         }
-        if (this.model.popupSearchListType === 1) {
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
+        }
+        else if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)){
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)){
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {

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

@@ -1,13 +1,13 @@
 <template>
   <div class="field-top">
     <div style="width:100%;display:flex">
-      <div style="flex:1" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+      <div style="flex:1;margin-right:5px" 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]">
             {{model.label}}
           </div>
-          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
+          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock)? 'manual' : 'click'">
             <div>
               <div>
                 <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
@@ -170,23 +170,18 @@
         if (this.model.lock) {
           return false;
         }
-        if (this.model.popupSearchListType === 1) {
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
+        }
+        else if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        //else if (this.model.popupSearchListType === 1) {
-        //  //todo 以后可加上即可选单搜索 又可高级搜索
-        //}
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {

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

@@ -1,7 +1,7 @@
 <template>
   <div class="field-top">
     <div class="ct-tags" style="width:100%;display:flex">
-      <div style="flex:1;display:flex" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-tags-'+model.attrs.size:''
+      <div style="flex:1;display:flex;margin-right: 5px;" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-tags-'+model.attrs.size:''
     ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div style="flex:1;position: relative;" :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]">
@@ -17,7 +17,7 @@
                 </span>
               </span>
             </div>
-            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
+            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'">
               <div>
                 <div>
                   <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
@@ -186,21 +186,19 @@
       clickHandle: function () {
         if (this.model.lock) {
           return false;
+        }        
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
         }
-        if (this.model.popupSearchListType === 1) {
+        else if(this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {
@@ -281,7 +279,12 @@
         var self = this;
         optionArr.forEach((s) => {
           if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
-            self.model.options.push(s);
+            let op={};
+            op[self.model.optionAttrs.value]=s[self.model.optionAttrs.value];
+            op[self.model.optionAttrs.label]=s[self.model.optionAttrs.label];
+            op[self.model.optionAttrs.rowid]='';
+            op[self.model.optionAttrs.flagDeleted]=false;
+            self.model.options.push(op);
             self.model.value.push(s[self.model.optionAttrs.value]);
           }
         });

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

@@ -151,7 +151,9 @@ const Base = function (source) {
       return bind;
     },
     reset() {
-      this.value = this.defaultValue;
+      if(this.type!==Enum.ControlType.Hidden){
+        this.value = this.defaultValue;
+      }
     },
     searchObj:{
       get dataType() { return source.dearchDataTyp; },

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

@@ -9,6 +9,7 @@ const Mo = function (source, moreActionRouter) {
   var rtn = {
     options: source.code1 === '' ? [] : [].concat(JSON.parse(source.code1)),
     optionAttrs: {
+      rowid: 'rowID',
       value: 'code',
       label: 'name',
       displayLabel:'displayName',

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

@@ -10,7 +10,10 @@ const SearchCategory = function (source, callBack) {
       showLabel:true,
       get value() {
         if(!data.code1){
-            return rtn.segmentValue[0].code;
+            if(rtn.segmentValue[0][rtn.optionAttrs.displayLabel]){
+              rtn.label=rtn.segmentValue[0][rtn.optionAttrs.displayLabel];
+            }
+            return rtn.segmentValue[0][rtn.optionAttrs.value];
         }
         return data.code1;
       },
@@ -24,7 +27,8 @@ const SearchCategory = function (source, callBack) {
         value: 'code',
         label: 'name',
         actionType: 'actionType',
-        flagDeleted: 'flagDeleted'
+        flagDeleted: 'flagDeleted',        
+        displayLabel: 'displayName',
       }
     };
     rtn = base.copy(Base(data), rtn);

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

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

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

@@ -9,6 +9,7 @@ const Tags = function (source, moreActionRouter) {
   var rtn = {
     options: source.code1 === '' ? [] : [].concat(JSON.parse(source.code1)),
     optionAttrs: {
+      rowid: 'rowID',
       value: 'code',
       label: 'name',
       displayLabel:'displayName',