centaline-data-driven 1.2.58 → 1.2.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.58",
+  "version": "1.2.61",
   "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,31 +34,31 @@
              <div>{{model.label}}</div>
              <div style="color:red;font-weight:700;">{{model.subText}}</div>             
   </el-button>
-  <el-button v-else-if="model.isCallTel" :id="model.id" 
+  <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}"
     :icon="model.icon"
     :disabled="model.disabled || model.locked">
-    <el-popover :ref="'popover'+model.id" 
+    <el-popover 
       class="Stats-popover" :popper-class="'el-popoverCallTel'" :placement="option.placement?option.placement:'left'" 
       v-model="visible" :trigger="option.trigger?option.trigger:''">
       <div style="border-bottom:none">
         <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" :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>
@@ -69,6 +69,8 @@
       vmodel: Object,
       fileData: Object,
       optionApi:String,
+      rowData: Object,
+      rowindex:Number,
     },
     mixins: [dynamicElement],
     data: function () {
@@ -82,7 +84,7 @@
         option: {
           isHidden: true,//是否开启操作栏隐藏设置，默认开启
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
-          appendId: '.el-button',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
+          appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
           trigger: 'manual',//触发方式，传值可查看Popper UI组件trigger属性
           placement: 'bottom-start',//方向，传值可查看Popper UI组件placement属性
         },
@@ -143,7 +145,7 @@
             this.tellImgUrl='';
           }
           else{
-            this.$emit('click',this.model);
+            this.$emit('click',this.model,this.rowData,this.rowindex);
           }
         }
         else{

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

@@ -91,9 +91,12 @@
                     </ct-tablecurrency>
                   </div>
                   <!--可点击的列-->
-                  <ct-tablecurrency v-else-if="column.router" :align="column.attrs.align" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :router="column.router" :colValue="row[column.id]" :rowData="row"
-                                    @click="rolRouterClickHandler">
-                  </ct-tablecurrency>
+                  <div v-else-if="column.routers" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" style="display: flex;">
+                    <component v-for="(router, i) in column.routers" :key="i" :ref="'router'+router.id+rowindex" :rowData="row" :rowindex="rowindex"
+                      v-if="!router.rightField || !row[router.rightField] || row[router.rightField] == 1" 
+                      :is="router.is" :vmodel="router" :api="model.optionApi" @click="rolRouterClickHandler">
+                    </component>
+                  </div>
                   <!--正常的列-->
                   <div v-else-if="typeof column.template === 'undefined'" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
                     {{row.rowHiddenColumns && row.rowHiddenColumns.includes(column.id)?"":row[column.id]}}
@@ -263,7 +266,8 @@
 
         return true;
       },
-      rolRouterClickHandler(field, rowData) {
+      rolRouterClickHandler(field, rowData,rowindex) {
+        field.rowindex=rowindex;
         var submitData = {};
         field.submitListField.forEach((k) => {
           submitData[k] = rowData[k];
@@ -401,7 +405,7 @@
                   self.$forceUpdate();
                 }
                 else if(field.actionType===19){
-                  self.$refs['router'+field.id][0].callTelClick(data);
+                  self.$refs['router'+field.id+field.rowindex][0].callTelClick(data);
                 }
               })
             }

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

@@ -1,7 +1,7 @@
 <template>
     <div>
-      <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" class="ct-PropertyDetailOFI"  v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
-      <ct-PropertyDetailRET :api="api" :apiParam="apiParam" class="ct-PropertyDetailRET"  v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
+      <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailOFI" v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
+      <ct-PropertyDetailRET :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailRET" v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
       <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-PropertySimpleDetailRET"  
       @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
       v-if="pageType=='PropertySimpleDetailRET'" @closeSideHandler="closeSideHandler"></ct-PropertySimpleDetailRET>
@@ -23,6 +23,7 @@
       vmodel: Object,
       api: String,
       apiParam: Object,
+      parentModel: Object,
       pageType: String,
       selectIndex:Number,
       rowCount:Number,

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

@@ -29,8 +29,8 @@
               <div>
                 <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 src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:11px">
-                <img src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px">
+                <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.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>
@@ -301,6 +301,7 @@
       vmodel: Object,
       api: String,
       apiParam: Object,
+      parentModel: Object,
     },
     data() {
       return {
@@ -313,7 +314,9 @@
           ],
         },
         allInfo: false,
-        allIn:false, 
+        allIn:false,
+        refershKey:0,
+        listKey:0,
       }
     },
     mounted() {
@@ -340,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);
@@ -429,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||'';
@@ -591,6 +595,30 @@
           clickAcion(field,submitData);
         }
       },
+      clickNextHandler() {
+        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);
+          }
+        }
+      },
     }
   }
 </script>

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/dynamicFile/src/dynamicFile.vue

@@ -13,6 +13,7 @@
                :headers="headers"
                :before-upload="beforeUploadProcess"
                :on-success="handleAvatarSuccess"
+               :on-error="handleAvatarError"
                :on-progress="uploadProcess"
                :limit="parseInt(model.max||999)"
                :on-exceed="handleExceed">
@@ -196,6 +197,14 @@
       handleAvatarSuccess(res, file, fileList) {
         this.model.handleAvatarSuccess(res, file, fileList);
       },
+      handleAvatarError(res, file, fileList) {
+        if(res.status===404){
+          let m=JSON.parse(res.message);
+          if(m.error){
+            this.$message.warning('path('+m.path+') '+m.error);
+          }
+        }
+      },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
 

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

@@ -110,6 +110,7 @@
                                   @click="rolRouterClickHandler">
                 </ct-tablecurrency>
 
+
                 <!--正常的列-->
                 <div v-else-if="column.flagHtml" v-html="row[column.id]" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :style="column.style ? column.style:''">                  
                 </div>

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

@@ -60,8 +60,8 @@ const ContactList = function (source,para ,callBack) {
           if (data.content.actionRouters) {
             data.content.actionRouters.forEach((v) => {
               var router = Router(v);
-              //router.is = "ct-btn";
-              //router.attrs = { size: "mini" }
+              router.is = "ct-btn";
+              router.attrs = { size: "mini" }
               rtn._actionRouter.push(router);
             });
           }
@@ -180,8 +180,7 @@ const ContactList = function (source,para ,callBack) {
                 if (col._router !== null) {
                   return col._router;
                 }
-                //todo
-                if (typeof v.routerKey !== "undefined") {
+                if (typeof v.routerKey !== "undefined" && v.routerKey && v.routerKey.indexOf(',')===-1) {
                   let router = rtn.actionRouter.find(b => {
                     return b.id === v.routerKey;
                   });
@@ -189,6 +188,23 @@ const ContactList = function (source,para ,callBack) {
                 }
                 return null;
               },
+              _routers: null,
+              get routers() {
+                if (col._routers !== null) {
+                  return col._routers;
+                }
+                if (typeof v.routerKey !== "undefined" && v.routerKey) {
+                  col._routers=[];
+                  v.routerKey.split(',').forEach((v) => {                    
+                    let router = rtn.actionRouter.find(b => {
+                      return b.id === v;
+                    });
+                    col._routers.push(router);
+                  });
+                  return col._routers;
+                }
+                return null;
+              },
               //是否高度自适应
               get autoRowHeight() {
                 return v.autoRowHeight;

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,

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

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

@@ -106,7 +106,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 if (col._router !== null) {
                   return col._router;
                 }
-                //todo
                 if (typeof v.routerKey !== "undefined") {
                   let router = rtn.actionRouter.find(b => {
                     return b.id === v.routerKey;