centaline-data-driven 1.1.48 → 1.1.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.1.48",
+  "version": "1.1.49",
   "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,7 @@ html {
   color: #fff;
 
 } */
-.el-button--mini, .el-button--mini.is-round{
+ .el-button--mini, .el-button--mini.is-round{
   padding: 0px 19px;
 }
  .el-button--primary {
@@ -637,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{
@@ -733,10 +730,6 @@ html {
   height: 26px!important;
   line-height: 26px!important;
  }
- .ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
-  min-height: 26px!important;
-  line-height: 26px;
-}
 .ct-rich-text {
   min-height: 26px!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

@@ -261,4 +261,12 @@
   .ct-file .el-icon-arrow-down {
     font-size: 12px;
   }
+  .el-upload--picture-card{
+    width: 120px;
+    height: 120px;
+    line-height: 120px;
+  }
+  .el-upload--picture-card i{
+    font-size: 34px;
+  }
 </style>

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

@@ -270,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/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/SearchTable.js

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