centaline-data-driven 1.4.98 → 1.4.99

package/package.json

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

package/src/centaline/css/max.css

@@ -1,6 +1,6 @@
 
 /* 查询搜索 */
-.max-search-btn,.max-more-btn{
+.max-search-btn,.max-more-btn,.el-container button.el-button.max.el-button--primary.el-button--mini.ct-font-size-mini{
     height: 26px;
     background: var(--chinaRed) !important;
     border-color: var(--chinaRed) !important;
@@ -22,6 +22,7 @@
    border-color: var(--btnHoverRed) !important;
     color: #fff !important;
  }
+
  .max-more-btn:hover .max-open,.max-more-btn:hover .max-fold{
   background-color: var(--btnHoverRed) !important;
  }
@@ -369,4 +370,8 @@
     .field-top  .ct-checkbox .el-checkbox.is-checked:hover .el-checkbox__input .el-checkbox__inner{
         border-color: var(--centalineBlue) !important;
     }
-
+.el-container button.el-button.max.el-button--primary.el-button--mini.ct-font-size-mini:hover{
+    background-color:var(--btnHoverRed) !important;
+    border-color: var(--btnHoverRed) !important;
+     color: #fff !important;
+ }

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -32,7 +32,7 @@
              :icon="model.icon"
              :disabled="model.disabled || model.locked">
              <div>{{model.label}}</div>
-             <div style="color:red;font-weight:700;">{{model.subText}}</div>             
+             <div class="subText">{{model.subText}}</div>             
   </el-button>
   <el-button v-else-if="model.isCallTel" class="max"
     :type="model.isHyperLink ? 'text' : 'primary'"
@@ -204,9 +204,16 @@
 </script>
 <style>
 .labelText{
--webkit-transform: scale(0.90);
+-webkit-transform: scale(0.85);
 }
 .el-popoverCallTel{
   margin-left: 5px;
 }
+.subText{
+  color:var(--chinaRed);;
+  font-weight:700;
+}
+.max-info:hover .subText{
+  color: #fff;
+}
 </style>

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -47,7 +47,8 @@
             </component>
             <button type="button" class="el-button el-button--info el-button--mini max-report rel w93"
               v-if="model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length > 0">
-              <img src="../../../assets/dian.png" alt="" class="report" />
+              <!-- <img src="../../../assets/dian.png" alt="" class="report" /> -->
+              <i class="el-icon-more"></i> 
               <ul class="report-cont">
                 <li v-for="(col, index) in model.actionRoutersMoreList" :key="index" v-if="col.show !== false">
                   <component class="max-report w93" :is="col.is" :vmodel="col" :api="model.optionApi"
@@ -1207,16 +1208,22 @@ export default {
       min-width: 400px;
       .max-report {
         height: 26px;
-        color: #333333;
+        line-height: 26px;
+        color: var(--centalineBlack);
         background-color: #ffffff;
-        border: 1px solid #e0e0e0;
+        border: 1px solid #C6C6C6;
         border-radius: 6px;
         font-size: 12px;
         z-index: 1;
       }
+      .max-report:hover{
+        background-color:var(--btnHoverRed) !important;
+   border-color: var(--btnHoverRed) !important;
+    color: #fff !important;
+      }
       .max-report:hover .report-cont {
         display: block;
-        color: #333;
+        color: var(--centalineBlack);
       }
       .report-cont {
         display: none;
@@ -1230,7 +1237,7 @@ export default {
         left: -61px;
         top: 26px;
         padding: 5px 0;
-        color: #333;
+        color: var(--centalineBlack);
       }
       .report-cont li {
         padding: 5px 10px;

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

@@ -46,7 +46,8 @@
               @click="fieldClickHandler(model.actionRouters[1], $event)"></component>
             <button type="button" class="el-button el-button--info el-button--mini max-report rel w93"
               v-if=" model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length > 0">
-              <img src="../../../assets/dian.png" alt="" class="report" />
+              <!-- <img src="../../../assets/dian.png" alt="" class="report" /> -->
+              <i class="el-icon-more"></i>  
               <ul class="report-cont">
                 <li v-for="(col, index) in model.actionRoutersMoreList" :key="index" v-if="col.show !== false">
                   <component class="max-report w93" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col, $event)"></component>
@@ -1218,16 +1219,22 @@ export default {
       min-width: 400px;
       .max-report {
         height: 26px;
-        color: #333333;
+        line-height: 26px;
+        color: var(--centalineBlack);
         background-color: #ffffff;
-        border: 1px solid #e0e0e0;
+        border: 1px solid #C6C6C6;
         border-radius: 6px;
         font-size: 12px;
         z-index: 1;
       }
+      .max-report:hover{
+        background-color:var(--btnHoverRed) !important;
+   border-color: var(--btnHoverRed) !important;
+    color: #fff !important;
+      }
       .max-report:hover .report-cont {
         display: block;
-        color: #333;
+        color: var(--centalineBlack);
       }
       .report-cont {
         display: none;
@@ -1241,7 +1248,7 @@ export default {
         left: -61px;
         top: 26px;
         padding: 5px 0;
-        color: #333;
+        color: var(--centalineBlack);
       }
       .report-cont li {
         padding: 5px 10px;

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="main" class="main" v-if="model !== null">
+  <div ref="main" class="main" v-if="model !== null" style="position: relative;overflow: hidden;">
     <div style="height:36px;margin-top: 10px;display: flex;border-bottom: solid 2px var(--chinaRed);">
       <el-popover v-if="model.routerForQRCode !== null" placement="left-start" trigger="hover"
         @show="fieldClickHandler(model.routerForQRCode, $event)">
@@ -25,7 +25,7 @@
       </div>
       <span v-if="model.flagAppMode" :slot="showIndex > 0 ? 'reference' : ''" class="more" style="margin-right: 10px;"
         @click="drawer = true"></span>
-      <el-drawer title="更多操作" :visible.sync="drawer" direction="ttb" :modal="false" class="drawerMore" size="30%">
+      <el-drawer title="更多操作" :visible.sync="drawer" direction="ttb" :modal="false" class="drawerMore" size="30%"  style="position: absolute;">
         <div style="display: flex;flex-flow:row wrap ">
           <component v-for="(router, index) in model.actionRoutersSimple.slice(showIndex)" :key="index"
             class="drawerButton"
@@ -673,21 +673,21 @@ export default {
 .drawerMore {
   width: 410px;
   left: auto;
-  top: 18px;
+  top: 0;
 }
 
 .v-modal {
   position: relative;
 }
 
-.drawerMore .el-drawer__container {
-  top: 70px;
-}
-
+/* .drawerMore  .el-drawer__container {
+  top: 27px;
+} */
 .drawerMore .el-drawer.ttb {
   height: auto !important;
   background: rgba(47, 47, 47, 0.8);
   padding-bottom: 10px;
+  padding-left: 10px;
 }
 
 .drawerMore .el-drawer__header {
@@ -708,10 +708,10 @@ export default {
 
 .drawerButton {
   margin-bottom: 10px !important;
-  margin-left: 6px !important;
+  margin-left: 5px !important;
   background-color: #181818 !important;
   border-color: #181818 !important;
-  width: 94px !important;
+  width: 92px !important;
   height: 56px !important;
 }
 

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

@@ -776,13 +776,15 @@ export default {
     },
     resetScroll: function () {
       var self = this;
-      if (self.$refs.tableParent.scrollTop > self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableHead.offsetHeight) {
-        self.$refs.tableParent.scrollTop = self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableHead.offsetHeight;
-      }
-      if (self.$refs.tableParent.scrollTop + self.$refs.tableParent.clientHeight <= self.$refs["rows." + self.model.selectIndex][0].offsetTop + self.$refs["rows." + self.model.selectIndex][0].offsetHeight) {
-        self.$refs.tableParent.scrollTop = self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableParent.clientHeight + self.$refs["rows." + self.model.selectIndex][0].offsetHeight;
+      if(self.$refs.tableParent && self.$refs["rows." + self.model.selectIndex]){
+        if (self.$refs.tableParent.scrollTop > self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableHead.offsetHeight) {
+          self.$refs.tableParent.scrollTop = self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableHead.offsetHeight;
+        }
+        if (self.$refs.tableParent.scrollTop + self.$refs.tableParent.clientHeight <= self.$refs["rows." + self.model.selectIndex][0].offsetTop + self.$refs["rows." + self.model.selectIndex][0].offsetHeight) {
+          self.$refs.tableParent.scrollTop = self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableParent.clientHeight + self.$refs["rows." + self.model.selectIndex][0].offsetHeight;
+        }
+        self.scrollTop = self.$refs.tableParent.scrollTop;
       }
-      self.scrollTop = self.$refs.tableParent.scrollTop;
     },
     rowKeyDownHandle(ev, action) {
       var self = this;

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

@@ -522,7 +522,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           if (rtn1) {
             if(attrKey=='code1' && rtn1.source.controlType===4 
               && attrValue!=undefined && attrValue!=null && attrValue!=''){
-                if(rtn1.source.decimals1 != undefined && rtn1.source.decimals1 != null){
+                if(rtn1.source.decimals1 != undefined && rtn1.source.decimals1 != null && rtn1.source.decimals1>-1){
                   attrValue = Number(attrValue).toFixed(rtn1.source.decimals1)
                 }
               }