centaline-data-driven 1.2.59 → 1.2.60

package/package.json

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

package/src/centaline/css/max.css

@@ -243,3 +243,9 @@
 .ct-table-content .ct-table .ct-tr .cell img{
     display: inherit;
 }
+
+
+.max.el-button.el-button--mini{
+    height: 26px;
+}
+

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

@@ -34,7 +34,7 @@
              <div>{{model.label}}</div>
              <div style="color:red;font-weight:700;">{{model.subText}}</div>             
   </el-button>
-  <el-button v-else-if="model.isCallTel"
+  <el-button v-else-if="model.isCallTel" class="max"
     :type="model.isHyperLink ? 'text' : 'primary'"
     v-bind="model.attrs" @click="clickHandle"
     :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
@@ -47,18 +47,18 @@
         <div style="color: #388cd3;text-align: center;">{{message}}</div>
         <img v-show="qrCode" :src="qrCode" style="margin-top: 5px;" :style="{'width':width+'px','height':height+'px'}" />
       </div>
-      <img v-if="model.imgUrl" slot="reference" :title="model.label+rowindex" :src="tellImgUrl?tellImgUrl:model.imgUrl" height="24px" />
+      <img v-if="model.imgUrl" slot="reference" :title="model.label" :src="tellImgUrl?tellImgUrl:model.imgUrl" :height="model.buttonHeight+'px'" />
       <span v-else slot="reference">{{model.label}}</span>
     </el-popover>
   </el-button>
-  <el-button v-else 
+  <el-button v-else  class="max"
     :type="model.isHyperLink ? 'text' : 'primary'"
     v-bind="model.attrs" @click="$emit('click',model)"
     :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
     :icon="model.icon"
     :disabled="model.disabled || model.locked">
-    <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" height="24px"/>
-     <span v-else>{{model.label}}</span>
+    <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" :height="model.buttonHeight+'px'"/>
+    <span v-else>{{model.label}}</span>
   </el-button>
 </template>
 <script>

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

@@ -593,14 +593,27 @@
         }
       },
       clickNextHandler() {
-        console.log(this.parentModel);
         if(this.parentModel){
+          let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
           this.parentModel.$vue.rowKeyDownHandle(null,1);
+          let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
+          if(oldValue!==newValue){
+            let parm=this.apiParam;
+            parm[this.parentModel.primaryKey]=newValue;
+            this.loaderObj.Detail(this.api,parm, this.load);
+          }
         }
       },
       clickPrevHandler() {        
         if(this.parentModel){
+          let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
           this.parentModel.$vue.rowKeyDownHandle(null,-1);
+          let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
+          if(oldValue!==newValue){
+            let parm=this.apiParam;
+            parm[this.parentModel.primaryKey]=newValue;
+            this.loaderObj.Detail(this.api,parm, this.load);
+          }
         }
       },
     }

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

@@ -322,6 +322,9 @@ const Router = function (source) {
         return true;
       }
     },
+    get buttonHeight() {
+      return source.buttonHeight||24;
+    },
   };
   return rtn;
 }