centaline-data-driven 1.2.59 → 1.2.62

package/package.json

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

package/src/centaline/css/ccai.css

@@ -0,0 +1,4 @@
+.ccai.ct-Sw .ct-radios {
+   padding-top: 0px;
+   padding-bottom: 0;
+  }

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/dynamicContactList.vue

@@ -98,6 +98,8 @@
                     </component>
                   </div>
                   <!--正常的列-->
+                  <div v-else-if="column.flagHtml" v-html="row[column.id]" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :style="column.style ? column.style:''">                  
+                  </div>
                   <div v-else-if="typeof column.template === 'undefined'" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
                     {{row.rowHiddenColumns && row.rowHiddenColumns.includes(column.id)?"":row[column.id]}}
                   </div>

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

@@ -30,7 +30,7 @@
                 <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default"
                 :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" @click="fieldClickHandler(model.otherTradeActionRouter,$event)"></component>
                 <img :class="{'domDisabled':parentModel && parentModel.selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:11px;cursor: pointer">
-                <img :class="{'domDisabled':parentModel && parentModel.listData && parentModel.selectIndex===parentModel.listData.rowCount-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px;cursor: pointer">
+                <img :class="{'domDisabled':parentModel && parentModel.listData && parentModel.selectIndex===parentModel.listData.length-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px;cursor: pointer">
               </div>
               <div class="mt5">
                 <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
@@ -138,7 +138,7 @@
               </div>
             </div>
             <div class="contacts-info base-box">
-              <ct-contactList v-if="model.contactApiRouter!==null" :apiRouter="model.contactApiRouter" ></ct-contactList>
+              <ct-contactList v-if="model.contactApiRouter!==null" :apiRouter="model.contactApiRouter" :key="'contact'+refershKey" ></ct-contactList>
             </div>
             <div class="tablist-info base-box">
                 <div class="details-tabs-box">
@@ -146,7 +146,7 @@
                     <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID" 
                     :index="index.toString()" :name="index.toString()" :label="col.appName"></el-tab-pane>
                   </el-tabs>
-                  <ct-searchlist v-if="model.searchConditionApiTags1" :key="model.searchlistKey"
+                  <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list'+listKey.toString()+refershKey"
                   :apiParam="model.paramDataTags1" :flagFocus="false"
                   :searchConditionApi="model.searchConditionApiTags1" 
                   :searchDataApi="model.searchDataApiTags1"></ct-searchlist>
@@ -175,7 +175,7 @@
               <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
                 <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
                   <div class="t-item">
-                    <span class="i">{{col.operationName}}</span>
+                    <span class="i" v-html="col.operationName"></span>
                   </div>
                   <div class="t-item"><span class="i" :class="'operation'+col.flagKey" :style="{color:col.descColor}">{{col.desc}}</span></div>
                   <div class="t-item" style="min-height: 50px;">
@@ -314,7 +314,9 @@
           ],
         },
         allInfo: false,
-        allIn:false, 
+        allIn:false,
+        refershKey:0,
+        listKey:0,
       }
     },
     mounted() {
@@ -341,6 +343,7 @@
         var self = this;
         this.model = data; 
         this.model.$vue = self;
+        this.refershKey=this.refershKey+1;
         this.loadFields();
         if(this.model.tags2 && this.model.tags2[0]){
           this.model.getTags2List(0);
@@ -430,7 +433,7 @@
         let i=key.index;
         this.model.activeIndex1=i;
         if(this.model.tags1 && this.model.tags1[i]){
-          this.model.searchlistKey=this.model.searchlistKey+1;
+          this.listKey=this.listKey+1;
           this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
           this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
           this.model.paramDataTags1=this.model.tags1[i].paramData||'';
@@ -593,14 +596,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() {        
+      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/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -223,10 +223,10 @@
         let i=key.index;
         this.model.activeIndex1=i;
         if(this.model.tags1 && this.model.tags1[i]){
-          this.model.searchlistKey=this.model.searchlistKey+1;
-          this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
-          this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
-          this.model.paramDataTags1=this.model.tags1[i].paramData||'';
+          // this.model.searchlistKey=this.model.searchlistKey+1;
+          // this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
+          // this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
+          // this.model.paramDataTags1=this.model.tags1[i].paramData||'';
         }
       },      
       fieldClickHandler(field) {

package/src/centaline/dynamicSw/src/dynamicSw.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="field-top">
-    <div v-if="model !== null" class="ct-Sw">
+    <div v-if="model !== null" class="ccai ct-Sw">
       <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]">
           {{model.label}}

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

@@ -247,7 +247,10 @@ const ContactList = function (source,para ,callBack) {
                 get title() {
                   return v.columnToolTip;
                 }
-              }
+              },
+              get flagHtml() {
+                return v.flagHtml;
+              },
             };
             if (col.show) {
               //合并表头时暂不支持固定列

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

@@ -20,8 +20,7 @@ const Detail = function (source,para ,callBack) {
         detailHeight:750,
         midlWidth:1200,
         activeIndex1:'0',
-        activeIndex2:'0',
-        searchlistKey:0,      
+        activeIndex2:'0',    
         tags2Key:0,    
         operationKey:0,
         _searchConditionApiTags1:null,
@@ -410,7 +409,7 @@ const Detail = function (source,para ,callBack) {
   if (typeof source === 'string') {
     Vue.prototype.$api.postHandler(common.globalUri(), { action: source,para:para}).then(
       function (response) {
-        if (response.rtnCode === Enum.ReturnCode.Successful) {
+        if (response.rtnCode === Enum.ReturnCode.Successful) {          
           var rtn = init(response.content);
           if (callBack) {
             callBack(rtn);

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