centaline-data-driven 1.2.38 → 1.2.41

package/src/centaline/dynamicSearchList/src/dynamicTableStats.vue

@@ -30,20 +30,21 @@
             </li>
           </ul>
         </div>
-        <el-popover :append-to-table="option.appendId?option.appendId:''" class="Stats-popover"
+        <el-popover :append-to-table="option.appendId?option.appendId:''" class="Stats-popover" popper-class="el-popover1"
                     :placement="option.placement?option.placement:'left'"
                     :trigger="option.trigger?option.trigger:''">
           <div v-if="FlagStatistics" class="tab-list" style="border-bottom:none">
-            <div class="tablf" v-for="(item, index) in showData[1]" @click="handleClick($event,item)" style="text-align:left">
-              <ul class="btnTab">
+            <div class="popovertablf" v-for="(item, index) in showData[1]" @click="handleClick($event,item)">
+              <ul class="popoverbtnTab" style="padding:0px">
                 <li :class="[selectStats==item.code1+'*'+item.controlLabel?'activecolor':'']">{{item.controlLabel}}</li>
                 <li class="tdcenter">
                   <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
                 </li>
               </ul>
+              <br />
             </div>
           </div>
-          <sapn slot="reference" class="icon-more">⋮</sapn>
+          <span slot="reference" class="icon-more">⋮</span>
 
         </el-popover>
       </template>
@@ -176,8 +177,8 @@
 
 <style>
   .tab-list {
-      position:relative; 
-    margin-bottom: 10px; 
+    position: relative;
+    margin-bottom: 10px;
     height: 30px;
   }
 
@@ -194,6 +195,10 @@
         color: #ee5d56;
       }
 
+    .tab-list .popoverbtnTab:hover, .tab-list .popovertablf:hover {
+      color: #ee5d56;
+    }
+
     .tab-list .tabl-el {
       max-width: 150px;
       box-shadow: 0 6px 12px rgb(0 0 0 / 18%);
@@ -207,6 +212,23 @@
       display: block;
     }
 
+    .tab-list .popovertablf {
+      font-size: 14px !important;
+      font-weight: bold;
+      text-align: center;
+      display: block;
+      padding: 5px 8px;
+    }
+
+    .tab-list .popoverbtnTab {
+      font-size: 14px !important;
+      font-weight: bold;
+      cursor: pointer;
+      float: left;
+      list-style-type: none;
+      padding: 0px 20px 0px 20px;
+    }
+
     .tab-list .tdcenter {
       line-height: 1px;
       height: 1px;
@@ -218,18 +240,21 @@
       /* border-bottom-right-radius: 12px !important; */
       /* border-top-right-radius: 11px; */
       width: 20px;
-      border-bottom: #ee5d56 solid 3px; 
+      border-bottom: #ee5d56 solid 3px;
     }
 
+
+
     .tab-list .activecolor {
       color: #ee5d56 !important;
     }
 
-
-    .tab-list .btnTab span {
+    .tab-list .btnTab span, .tab-list .popovertablf span {
       display: inline-block;
     }
 
+
+
     .tab-list .icon-more {
       color: #ee5d56;
       font-size: 20px;
@@ -240,8 +265,16 @@
       cursor: pointer;
     }
 
-  .Stats-popover {
-      position:absolute;
-      right:5px;
+   .Stats-popover {
+    float: left;
+    margin-top: 4px;
+    margin-left: 4px;
+    height: 16px;
+  }
+
+</style>
+<style>
+  .el-popover1 {
+    min-width: inherit !important;
   }
 </style>

package/src/centaline/dynamicSeg/src/dynamicSeg.vue

@@ -57,6 +57,7 @@
     methods: {
       load(data) {
         this.model = data;
+        this.model.self = this;
       },
       clearClickHandle: function (event) {
         this.model.value = '';

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="field-top">
-    <div v-if="model !== null" class="ct-text ct-flex-div max-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']"
-         @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
+    <div style="width:100%;display:flex;">
+    <div v-if="model !== null" class="ct-text ct-flex-div max-flex-div"  style="flex:1;"
+    :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']"
+    @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div max-input-group" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
@@ -19,13 +21,14 @@
       </el-input>
 
       <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
-      <transition name="el-fade-in" class="ct-flex-div-span">
-        <span v-show="!valid" class="errorMessage ">
-          {{validMessage}}
-        </span>
-      </transition>
       <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @click="model.value=$event"></ctQuickInputSos>
     </div>
+    <transition name="el-fade-in" class="ct-flex-div-span">
+      <span v-show="!valid" class="errorMessage ">
+        {{validMessage}}
+      </span>
+    </transition>
+  </div>
   </div>
 </template>
 <script>
@@ -34,7 +37,7 @@
   export default {
     name: 'ct-text',
     mixins: [dynamicElement],
-     components: {
+    components: {
       'ctQuickInputSos': ctQuickInputSos,
     },
     props: {

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

@@ -9,7 +9,6 @@ import Vue from 'vue';
 
 const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
   var init = function (source) {
-    //source.layoutOrientation = Enum.Orientation.Horizontal;
     let rtn = {
       get source() {
         return source;

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

@@ -301,6 +301,12 @@ const Router = function (source) {
         }
       });
     },
+    get subText() {
+      return source.subText;
+    },
+    get locked() {
+      return source.locked;
+    },
   };
   return rtn;
 }

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

@@ -157,7 +157,10 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 get title() {
                   return v.columnToolTip;
                 }
-              }
+              },              
+              get flagHtml() {
+                return v.flagHtml;
+              },
             };
             if (col.show) {
               //合并表头时暂不支持固定列
@@ -252,8 +255,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       },
       set selectAllType(v1) {
         source.selectAllType = v1;
-      },
-      
+      },      
       getSelectRowData(router) {
         if (rtn.listData.length === 0) {
           return null;
@@ -838,6 +840,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
         return c;
       },
+      get rowMenuDisplayCount() {
+        return source.content.rowMenuDisplayCount && source.content.rowMenuDisplayCount>0?source.content.rowMenuDisplayCount : 4;
+      },
     };
     if (rtn.template) {
       var tempLoader = template.loader(rtn.template).default;

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -1,6 +1,6 @@
 <template>
   <div :class="isOperationalColumn?'subdiv_allinline':''" v-if="isShowLabel">
-    <img v-if="router.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="router.label" @click="clickHandler($event);" />
+    <img v-if="router.imgUrl && isShowImg" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="router.label" @click="clickHandler($event);" />
     <a v-else href="javascript:void(0);" class="ct-tablecurrencyItem" @click="clickHandler($event)">
       {{label}}
     </a>
@@ -14,9 +14,14 @@
       router: Object,
       rowData: Object,
       colValue: String,
+      rowindex: Number,
       isOperationalColumn: {
         type: Boolean,
         default: false
+      },
+      isShowImg: {
+        type: Boolean,
+        default: true
       }
     },
     computed: {
@@ -38,7 +43,7 @@
     },
     methods: {
       clickHandler(ev) {
-        this.$emit('click', this.router, this.rowData);
+        this.$emit('click', this.router, this.rowData,this.rowindex);
       }
     }
   }

package/src/main.js

@@ -13,7 +13,7 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  // baseUrl: "http://10.1.245.111:38028/v1/form/router",  
+  // baseUrl: "http://tjcptest.centaline.com.cn/",  
   // baseUrl: "http://10.88.22.46:7070/", 
   // flagRouterSelf: true,
   zindex: 999,
@@ -36,7 +36,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '5e730b63-1439-4850-9e88-4a83c8609525',
+        oldToken: 'fd2b9945-9709-4608-a57b-13a8ad61030a',
         estateId: '20210729104021C49F04B55C50F6AF58',
         originalRequestURL: 'http://10.88.22.67:8080',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',