centaline-data-driven 1.1.51 → 1.1.52

package/package.json

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

package/src/SearchTree.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
     <ct-treelist :flagsearch="true" :apiParam="apiParam"
-                 :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
+                 :searchConditionApi="'/SystemParameterCatalogList/getListOfSearchModel'"
                  :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
@@ -14,7 +14,11 @@
     data() {
       return {
         isShowSearchlist: false,
-        apiParam: {}
+        apiParam: {
+          flagSearch: true,
+          searchFields: {},
+          pageAttribute: {pageIndex: 1}
+        }
       }
     },
     methods: {

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;

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/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/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/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,
 };