centaline-data-driven 1.4.93 → 1.4.95

package/package.json

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

package/src/SearchTree.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
     <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
-                 :searchConditionApi="'/system/menulist/getTreeLayoutOfSearch'"
-                 :searchDataApi="'/system/menulist/getTreeList'" @loaded="loaded"></ct-treelist>
+                 :searchConditionApi="'/orgtree/getLayoutOfSearch'"
+                 :searchDataApi="'/orgtree/getList'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

package/src/centaline/css/common.css

@@ -17,7 +17,16 @@ html {
 *:after {
   box-sizing: inherit;
 }
-
+:root{
+  --chinaRed:#E03333;
+  --centalineBlue:#3D5ECC;
+  --centalineBlack:#111111;
+  --btnHoverRed:#FA5252;
+  --btnFocusRed:#AD1717;
+  --centalineGray:#666666;
+  --centalineMediumGray:#888888;
+  --centalinePlaceholder:#AAAAAA;
+}
 .ct-so {
   font-size: 14px;
   position: relative;
@@ -28,7 +37,6 @@ html {
      background-color: #fff;
      background-image: none;
      border-radius: 4px;
-     border: 1px solid #dcdfe6;
      -webkit-box-sizing: border-box;
      box-sizing: border-box;
      color: #606266;
@@ -53,7 +61,7 @@ html {
  
    .ct-so.isfocus .ct-input_inner:hover, .ct-so.isfocus .ct-input_inner, .ct-tags.isfocus .ct-input_inner:hover, .ct-tags.isfocus .ct-input_inner,
    .ct-iti .isfocus {
-     border-color: #409EFF; /*border-color:#c0c4cc*/
+     border-color: var(--centalineBlue); /*border-color:#c0c4cc*/
    }
  
    .ct-so .el-input__suffix, .ct-tags .el-input__suffix {
@@ -62,7 +70,7 @@ html {
    }
  
    .ct-so .el-select__caret {
-     color: #c0c4cc;
+     color: #BBBBBB;
      font-size: inherit;
      -webkit-transition: -webkit-transform .3s;
      transition: -webkit-transform .3s;
@@ -138,7 +146,9 @@ html {
      .el-input-group__prepend {
        min-width: 72px;
      }
- 
+ .ct-iti .el-input__inner,.ct-text .el-input__inner,.ct-so .ct-input_inner{
+  border: 1px solid #C6C6C6;
+ }
  .ct-dialog_wrapper {
    /*position: absolute;*/
    position: fixed;
@@ -414,7 +424,7 @@ html {
  }
  /*必填label*/
  .requiredLabel {
-   color: #F00!important;
+   color: var(--chinaRed)!important;
  }
  
  .ct-dialog .el-main {
@@ -455,39 +465,39 @@ html {
 }
  .el-button--primary {
    height: 26px;
-   background-color: #EE6B6B ;
-   border-color: #EE6B6B ;
+   background-color: var(--chinaRed);
+   border-color: var(--chinaRed);
  }
  .el-button--primary:hover ,.el-button--warning:hover{
-   background: #f1706b;
-   border-color: #f1706b;
+   background: var(--btnHoverRed);
+   border-color: var(--btnHoverRed);
    color: #FFF;
  }
  .el-button--primary:focus {
-   background: #de534d;
-   border-color: #de534d;
+   background: var(--btnFocusRed);
+   border-color: var(--btnFocusRed);
    color: #FFF;
  }
  .el-button--success {
-   background-color: #EE6B6B ;
-   border-color: #EE6B6B ;
+   background-color: var(--chinaRed);
+   border-color: var(--chinaRed) ;
  }
  
  .el-button--success:focus {
-   background: #de534d;
-   border-color: #de534d;
+   background: var(--btnFocusRed);
+   border-color: var(--btnFocusRed);
    color: #FFF;
  }
  .el-button--success:hover {
-   background: #f1706b;
-   border-color: #f1706b;
+   background: var(--btnHoverRed);
+   border-color: var(--btnHoverRed);
    color: #FFF;
  }
 /* 工具栏按钮置灰 */
 .ct-tableToolbar button {
     border: 1px solid #ced0d9;
-    background-color: #f2f4f7;
-    color: #333;
+    background-color: #fff;
+    color: var(--centalineBlack);
 }
 .ct-tableToolbar button:hover{
     color: #666;
@@ -512,7 +522,7 @@ html {
 .el-select__tags .el-tag.el-tag--info{
   background-color: #fff;
   border-color: none;
-  color: #409EFF;
+  color: var(--centalineBlue);
 }
  /*修改删除按钮*/
  .el-table__row .el-tag.el-tag--info {
@@ -688,15 +698,15 @@ html {
   margin-top: 0;
 }
 .el-tabs__nav .el-tabs__item:hover{
-  color: #ff503f;
-  border-bottom: 3px solid #ff503f;
+  color: var(--chinaRed);
+  border-bottom: 3px solid var(--chinaRed);
 }
 .el-tabs__nav .el-tabs__item.is-active{
-  color: #ff503f;
-  border-bottom: 3px solid #ff503f;
+  color: var(--chinaRed);
+  border-bottom: 3px solid var(--chinaRed);
 }
 .el-tabs__active-bar{
-  background-color: #ff503f;
+  background-color: var(--chinaRed);
 }
 .el-tabs__nav .el-tabs__item{
   font-weight: bold;
@@ -718,8 +728,11 @@ html {
   background-color: #d6d6d6;
   border-color: #d6d6d6;
 }
+/* 工具栏按钮 不能炒作 灰色*/
 .ct-tableToolbar .is-disabled {
-  background: #b1b3bc !important;
+  background: #EDEDED !important;
+border: 1px solid #E0E0E0;
+color: var(--centalinePlaceholder);
 }
   .ct-tableToolbar .is-disabled:hover {
     color: #333 !important;
@@ -816,11 +829,11 @@ html {
   width: 85px;
 }
 .el-radio__input.is-checked .el-radio__inner {
-  border-color: #409eff;
-  background: #409eff;
+  border-color: var(--centalineBlue);
+  background: var(--centalineBlue);
 }
 .el-radio__input.is-checked + .el-radio__label {
-  color: #409eff;
+  color: var(--centalineBlue);
 }
 .el-input-group{
   line-height: 22px;
@@ -847,4 +860,7 @@ html {
 .ml10{
   margin-left: 10px;
 }
+.searchlistTab .el-tabs__header{
+  margin-bottom: 0px;
+}
 

package/src/centaline/css/max.css

@@ -1,37 +1,35 @@
 
 /* 查询搜索 */
-.max-search-btn{
+.max-search-btn,.max-more-btn{
     height: 26px;
-    background: #EE6B6B;
+    background: var(--chinaRed) !important;
+    border-color: var(--chinaRed) !important;
     box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
-    border-color: #EE6B6B;
     border-radius: 6px;
-
-}
-.max-search-btn:hover{
-   background-color:#FF9393;
-   border-color: #FF9393;
+    color: #fff !important;
 }
-.max-search-btn:active,.max-search-btn:focus{
-    background-color: #B33136;
-    border-color: #B33136;
-}
-/* 重置按钮 */
+/* 重置按钮 更多按钮*/
 .max-reset-btn{
     height: 26px;
-    background: #519DA6;
-    border-color: #519DA6;
-    box-shadow: 0px 2px 4px 0px rgba(82,157,166,0.25);
+    background: #FFFFFF !important;
+    border-color: var(--chinaRed) !important;
     border-radius: 6px;
+    color: var(--chinaRed) !important;
 }
-.max-reset-btn:hover{
-    background-color:#85CAD2;
-    border-color: #85CAD2;
+ /* 搜索按钮,重置按钮和更多按钮的hover */
+ .max-search-btn:hover,.max-reset-btn:hover,.max-more-btn:hover{
+  background-color:var(--btnHoverRed) !important;
+   border-color: var(--btnHoverRed) !important;
+    color: #fff !important;
  }
- .max-reset-btn:active.max-reset-btn:focus{
-     background-color: #35838C;
-     border-color: #35838C;
+ .max-more-btn:hover .max-open,.max-more-btn:hover .max-fold{
+  background-color: var(--btnHoverRed) !important;
  }
+ .max-search-btn:active,.max-search-btn:focus,.max-reset-btn:active.max-reset-btn:focus,.max-more-btn:active.max-more-btn:focus{
+    background-color: var(--btnFocusRed);
+    border-color: var(--btnFocusRed);
+    color: #fff !important;
+}
 /* 工具栏按钮 */
 .max-ToolbarButton{
     margin-right: 10px!important;
@@ -62,12 +60,12 @@
     border-radius: 6px;
 }
 .max-btn-add button:hover,.max-btn-add:hover{
-    background-color:#FF9393;
-    border-color: #FF9393;
+    background-color:var(--btnHoverRed);
+    border-color: var(--btnHoverRed);
 }
 .max-btn-add button:focus,.max-btn-add button:active,.max-btn-add:focus,.max-btn-add:active{
-    background-color: #B33136;
-    border-color: #B33136;
+    background-color: var(--btnFocusRed);
+    border-color: var(--btnFocusRed);
 }
 .max-comfirm-content button{
     height: 26px;
@@ -134,6 +132,7 @@
     float: left;
     margin-right: 2px;
     margin-left: -8px;
+    background-color: var(--chinaRed);
 }
 .max-fold{
     background: url(../../assets/max-fold.png)no-repeat;
@@ -144,6 +143,7 @@
     float: left;
     margin-right: 2px;
     margin-left: -8px;
+    background-color: var(--chinaRed);
 }
 
 .ct-tableParent::-webkit-scrollbar-thumb{
@@ -191,28 +191,38 @@
     text-align: left !important;
   }
 /* 重置input默认颜色 选中文字颜色 */
-  .ct-search-list input::-webkit-input-placeholder,.ct-iti-editor input::-webkit-input-placeholder{
-      color: #666666!important;
+  .ct-search-list input::-webkit-input-placeholder,.ct-iti-editor input::-webkit-input-placeholder,.ct-flex-div-input input::-webkit-input-placeholder{
+      color: var(--centalinePlaceholder) !important;
   }
   .ct-search-list .el-date-editor .el-range-input,.ct-search-list .el-input__inner{
-      color: #409eff;
+      color: var(--centalineBlue);
   }
   .ct-so .ct-input_inner,.ct-text .showLabel input,.ct-text .showLabel label{
-    color: #409eff!important;
+    color: var(--centalineBlue) !important;
   }
+  /* 多选框 */
   .cover-list-item .el-checkbox__input.is-checked + .el-checkbox__label,.cover-list-item .el-checkbox__input.is-checked .el-checkbox__inner{
-      color: #409eff;
+      color: var(--centalineBlue) !important;
   }
   .ct-inputNumber input.el-range-input {
-    color: #409eff!important;
+    color: var(--centalineBlue) !important;
     cursor: text;
   }
   .cover-list-item .el-checkbox__input.is-checked .el-checkbox__inner{
-    background-color:#409eff;
-    border-color: #409eff;
+    background-color:var(--centalineBlue);
+    border-color: var(--centalineBlue);
   }
+  .cover-list-item .el-checkbox__input.is-focus .el-checkbox__inner,.cover-list-item .el-checkbox__inner:hover{
+    border-color:var(--centalineBlue) !important;
+    }
+    .cover-list-item .el-checkbox:hover .el-checkbox__inner{
+        border-color:var(--centalineBlue) !important;
+    } 
+    .cover-list-item .el-checkbox:hover .el-checkbox__label{
+        color: var(--centalineBlue) !important;
+    } 
   .st-serach-screen .el-input-group__append, .st-serach-screen .el-input-group__prepend{
-    color: #666666!important;
+    color: var(--centalineBlack)!important;
   }
   .ct-so .ct-input_inner,.el-input__inner{
       border-radius: 6px!important;
@@ -249,12 +259,34 @@
  .hyperLinkList .el-button + .el-button{
       margin-left: 0!important;
   }
+  /* 弹窗 单选按钮鼠标移上 */
+ .field-top .ct-radios .el-radio__inner:hover{
+    border-color: var(--centalineBlue) !important;
+}
+.field-top .ct-radios .el-radio:hover .el-radio__input .el-radio__inner{
+    border-color: var(--centalineBlue) !important;
+}
+.field-top .ct-radios .el-radio:hover .el-radio__label{
+    color: var(--centalineBlue) !important;
+}
+.field-top .ct-radios .el-radio.is-disabled:hover .el-radio__label{
+    color: #c0c4cc !important;
+}
+.field-top .ct-radios .el-radio.is-disabled:hover .el-radio__input .el-radio__inner{
+  border-color: #d6d6d6 !important;
+}
+.field-top .ct-radios .el-radio.is-checked:hover .el-radio__label{
+    color: var(--centalineBlue) !important;
+}
+.field-top .ct-radios .el-radio.is-checked:hover .el-radio__input .el-radio__inner{
+    border-color: var(--centalineBlue) !important;
+}
   .el-radio__input.is-checked .el-radio__inner {
-    border-color: #409eff;
-    background: #409eff;
+    border-color: var(--centalineBlue) !important;
+    background: var(--centalineBlue) !important;
 }
 .el-radio__input.is-checked + .el-radio__label {
-    color: #409eff;
+    color: var(--centalineBlue) !important;
 }
 .ct-table-content .ct-table .ct-tr .cell img{
     display: inherit;
@@ -271,7 +303,7 @@
     cursor: text;
 }
   .dragItem .el-checkbox__input.is-checked+.el-checkbox__label {
-    /* color: #409EFF !important; */
+    /* color: var(--centalineBlue) !important; */
     color: #666 !important;
 }
 #dragAll .el-checkbox__input.is-checked+.el-checkbox__label{
@@ -279,8 +311,8 @@
 }
 /* .dragItem .el-checkbox__input.is-checked .el-checkbox__inner,
 .dragItem .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-    background-color: #409EFF !important;
-    border-color: #409EFF !important;
+    background-color: var(--centalineBlue) !important;
+    border-color: var(--centalineBlue) !important;
 } */
 .ct-inputNumber .el-input-group {
     display: flex;
@@ -299,4 +331,42 @@
 }
 .ct-iti .el-date-editor .el-input__icon,.ct-iti .el-date-editor .el-input__inner,.ct-iti .el-date-editor .el-input__prefix,.ct-iti .el-date-editor .el-range-input,.ct-iti .el-date-editor .el-range-separator{
     cursor: auto !important;
-}
+}
+.ct-iti .el-date-editor .ct-unitname.el-input__suffix.el-input__suffix-inner{
+    color: var(--centalinePlaceholder);
+}
+.ct-checkbox .el-checkbox {
+    color: var(--centalineBlack);
+}
+.ct-td  .el-checkbox__input.is-checked .el-checkbox__inner{
+     background-color: var(--chinaRed) !important;
+    border-color: var(--chinaRed) !important;
+ }
+ .ct-td  .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+    background-color: var(--chinaRed) !important;
+    border-color: var(--chinaRed) !important;
+    }
+    /* 弹窗多选框 */
+    .field-top .el-checkbox__input.is-focus .el-checkbox__inner,.field-top .el-checkbox__inner:hover{
+        border-color:var(--centalineBlue) !important;
+        }
+    .field-top .el-checkbox__input.is-checked .el-checkbox__inner {
+        background-color:var(--centalineBlue) !important;;
+        border-color: var(--centalineBlue) !important;;
+    } 
+    .field-top .el-checkbox:hover .el-checkbox__inner{
+        border-color:var(--centalineBlue) !important;
+    } 
+    .field-top .ct-checkbox .el-checkbox.is-disabled:hover .el-checkbox__label{
+        color: #c0c4cc !important;
+    }
+    .field-top  .ct-checkbox .el-checkbox.is-disabled:hover .el-checkbox__input .el-checkbox__inner{
+      border-color: #d6d6d6 !important;
+    }
+    .field-top .ct-checkbox .el-checkbox.is-checked:hover .el-checkbox__label{
+        color: var(--centalineBlue) !important;
+    }
+    .field-top  .ct-checkbox .el-checkbox.is-checked:hover .el-checkbox__input .el-checkbox__inner{
+        border-color: var(--centalineBlue) !important;
+    }
+

package/src/centaline/dynamicComboBoxWithTextBox/src/dynamicComboBoxWithTextBox.vue

@@ -251,6 +251,6 @@
     }
 
     .ct-combobox-with-textbox .el-input.is-focus .el-input__inner {
-      border: 1px solid #409EFF !important;
+      border: 1px solid var(--centalineBlue) !important;
     }
 </style>

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

@@ -477,7 +477,7 @@
   .title-l{
     font-weight: Bold;
     font-size: 16px;
-    color: #333333;
+    color: var(--centalineBlack);
   }
   .contacts-head {
     display: flex;
@@ -503,36 +503,35 @@
   font-size: 12px;
 }
 .max-default{
-  border: 1px solid #EE6B6B;
-  color: #EE6B6B;
+  border: 1px solid var(--chinaRed);
+  color: var(--chinaRed);
   height: 26px;
-  
   border-radius: 6px;
   font-size: 12px;
 }
 .max-info:hover,.max-default:hover{
-    background-color:#FF9393;
-    border-color: #FF9393;
+    background-color:var(--btnHoverRed);
+    border-color: var(--btnHoverRed);
     color: #fff;
 }
 .max-info:active,.max-default:active{
-    background-color: #B33136;
-    border-color: #B33136;
+    background-color:  var(--btnFocusRed);
+    border-color:  var(--btnFocusRed);
     color: #fff;
 }
 .max-btn-add button{ /*list-button*/
     height: 26px;
-    background: #EE6B6B;
+    background: var(--chinaRed);
     box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
     border-radius: 6px;
 }
 .max-btn-add button:hover{
-    background-color:#FF9393;
-    border-color: #FF9393;
+    background-color:var(--btnHoverRed);
+    border-color: var(--btnHoverRed);
 }
 .max-btn-add button:focus,.max-btn-add button:active{
-    background-color: #B33136;
-    border-color: #B33136;
+    background-color:  var(--btnFocusRed);
+    border-color:  var(--btnFocusRed);
 }
 .max-comfirm-content button{
     height: 26px;
@@ -605,7 +604,7 @@
   }
 
   .ct-table {
-    color: #606266;
+    color: #1F2233;
     font-size: 18px;
     line-height: 40px;
     min-height: 40px;
@@ -659,11 +658,11 @@
     background-color: #ecf5ff !important;
   }
   .ct-table .ct-td.asc > .caret-wrapper > .sort-caret.ascending {
-    border-bottom-color: #409eff;
+    border-bottom-color: var(--centalineBlue);
     top: 5px;
   }
   .ct-table .ct-td.desc > .caret-wrapper > .sort-caret.descending {
-    border-top-color: #409eff;
+    border-top-color: var(--centalineBlue);
     bottom: 7px;
   }
   .ct-table .cell {