centaline-data-driven 1.2.38 → 1.2.39

package/package.json

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

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1"} ,
+        apiParam: {actionType: 1,chanceID: "2"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/api/third-dept-tran/profit-return/applyUI'" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/PropertyRET/getLayoutOfNewStepOne'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/Flow/readDetail'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
@@ -17,7 +17,7 @@
         // apiParam: {profitReturnId: "1504359257134055426", actionType: 1, pageStyle: 2, pageTitle: "查看返利", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
-        apiParam: {actionType: "2", pageStyle: "2", pageTitle: "新增盘源", pageOnly: "true"},
+        apiParam: {actionType: "2",jsonData: {}},
       }
     },
     methods: {

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

@@ -5,7 +5,7 @@
                placement="bottom"
                @click.native="dropClick" 
                @command="commandClick"
-               :disabled="model.disabled">
+               :disabled="model.disabled || model.locked">
     <el-button type="primary">
       {{model.label}}<i class="el-icon-arrow-down el-icon--right"></i>
     </el-button>
@@ -13,15 +13,7 @@
       <el-dropdown-item v-for="item in model.elementOptions" :key="item.code" :command="item.code">{{item.name}}</el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
-  <el-button v-else-if="!model.isImport"
-             :type="model.isHyperLink ? 'text' : 'primary'"
-             v-bind="model.attrs" @click="$emit('click',model)"
-             :style="{color:model.textColor,backgroundColor:model.bgColor,borderColor:model.borderColor}"
-             :icon="model.icon"
-             :disabled="model.disabled">
-             <!-- <i v-if="model.isShowIocn" :class="model.iconClass"></i> -->
-             {{model.label}}</el-button>
-  <el-upload v-else
+  <el-upload v-else-if="model.isImport"
              :action="model.action"
              v-bind="model.attrs"
              size="mini"
@@ -33,6 +25,23 @@
              :on-error="handleAvatarError">
     <el-button size="mini" type="primary">{{model.label}}</el-button>
   </el-upload>
+  <el-button v-else-if="model.subText" style="height: 100%;padding: 5px 0;"
+             :type="model.isHyperLink ? 'text' : 'primary'"
+             v-bind="model.attrs" @click="$emit('click',model)"
+             :style="{color:model.textColor,backgroundColor:model.bgColor,borderColor:model.borderColor}"
+             :icon="model.icon"
+             :disabled="model.disabled || model.locked">
+             <div>{{model.label}}</div>
+             <div style="color:red;font-weight:700;">{{model.subText}}</div>             
+  </el-button>
+  <el-button v-else
+             :type="model.isHyperLink ? 'text' : 'primary'"
+             v-bind="model.attrs" @click="$emit('click',model)"
+             :style="{color:model.textColor,backgroundColor:model.bgColor,borderColor:model.borderColor}"
+             :icon="model.icon"
+             :disabled="model.disabled || model.locked">
+             {{model.label}}
+  </el-button>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement'

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -40,7 +40,6 @@
     created() {
       var self = this;
       this.$nextTick(function () {
-
         if (self.vmodel) {
           self.load(self.vmodel);
           self.$emit('loaded');

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

@@ -510,7 +510,7 @@
   }
 .ct-searchtable .ct-table {
     min-width: 100%;
-    border-collapse: separate;
+    border-collapse: collapse;
   }
     .ct-searchtable .ct-table th {
       background-color: #f4f7fa !important;

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

@@ -178,7 +178,7 @@
                     <span class="i">{{col.operationName}}</span>
                   </div>
                   <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
-                  <div class="t-item" style="height: 50px;">
+                  <div class="t-item" style="min-height: 50px;">
                     <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
                   </div>
                 </div>                  

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading" style="width:100%">
+  <div v-loading="loading" :style="{width:pageWidth?pageWidth+'px':'100%',margin:'auto'}">
     <div v-if="model !== null && !loading" class="ct-form"  :class="{'domDisabled':model.pageDisabled}">
       <!--可根据场景判断显示el-card还是el-main-->
       <component :is="model.showTitle?'el-main':'el-card'">
@@ -95,6 +95,7 @@
       source: Object,
       apiParam: Object,
       parentModel: Object,
+      pageWidth: Number,
       showTitle: {
         type: Boolean,
         default: false
@@ -380,7 +381,7 @@
               }
               else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
                 submitData = field.getActionPara(submitData).para;
-                self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
+                self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle,self.model,field.dialogWidth);
               }
               else if (field.isBrowserNewTab) {// 浏览器打开
                 submitData = field.getActionPara(submitData).para;

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="field-top">
-    <div style="width:100;" v-if="model !== null" class="ct-inputNumber" :class="[model.attrs.size?'ct-font-size-'+model.attrs.size:'',model.lock ? 'ct-inputNumber-lock' : ''
+    <div style="width:100%;display:flex;">
+    <div style="flex:1;" v-if="model !== null" class="ct-inputNumber" :class="[model.attrs.size?'ct-font-size-'+model.attrs.size:'',model.lock ? 'ct-inputNumber-lock' : ''
        ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
       <div class="ct-flex-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 field-label-div" :class="[model.labelClass]">
@@ -23,13 +24,14 @@
           <span v-if="model.unitName" class="ct-unitname el-input__suffix el-input__suffix-inner" :class="showClear?'unitName-20':'unitName-0'">{{model.unitName}}</span>
         </div>
         <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
-        <transition name="el-fade-in ct-flex-div-span">
-          <span v-show="!valid" class="errorMessage">
-            {{validMessage}}
-          </span>
-        </transition>
       </div>
     </div>
+    <transition name="el-fade-in ct-flex-div-span">
+      <span v-show="!valid" class="errorMessage">
+        {{validMessage}}
+      </span>
+    </transition>
+  </div>
   </div>
 </template>
 <script>

package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue

@@ -1,15 +1,14 @@
 <template>
-  <div class="ct-form-list" v-focus="foucus" :class="{'tableDisabled':model.tableDisabled}">
+  <div class="ct-form-repeat" v-focus="foucus" :class="{'tableDisabled':model.tableDisabled}">
     <div class="list-button">
       <el-button v-if="model.create" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
         新增
       </el-button>
     </div>
-
-    <div class="el-col el-col-24" v-for="(v, i) in model.tableData" :key="v.guid" v-if="!v.deleted">
-      <div class="list-title">
-        <h5>{{model.title}}</h5>
-      </div>
+    <div class="list-title">
+      <h5>{{model.title}}</h5>
+    </div>
+    <div class="el-col el-col-24 ct-form-repeat-el-col"  v-for="(v, i) in model.tableData" :key="v.guid" v-if="!v.deleted">
       <el-row v-if="v.field.length > 0">
         <el-col v-for="(col, index) in v.field" :key="col.guid" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
           <component ref="Fields" :is="col.is" :vmodel="col" :api="model.OptApi" v-bind="col.bindPara"
@@ -18,7 +17,7 @@
         </el-col>
       </el-row>
       <div class="list-button" v-if="i>0">
-        <el-button v-if="v.delete" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="deleteRow(i)">
+        <el-button v-if="v.delete" type="success" class=" max-btn-add" size="mini" icon="el-icon-delete" @click="deleteRow(i)">
           删除
         </el-button>
       </div>
@@ -137,50 +136,32 @@
   }
 </script>
 <style>
-  .el-table-add-row {
-    margin-top: 10px;
-    width: 100%;
-    height: 34px;
-    border: 1px dashed #c1c1cd;
-    border-radius: 3px;
-    cursor: pointer;
-    justify-content: center;
-    display: flex;
-    line-height: 34px;
-  }
-
-  .ct-form-list .list-title {
-    padding-bottom: 5px;
-    text-align: left;
-    display: inline-table;
-    width: 45%;
-  }
-
-  .ct-form-list .list-button {
-    padding-bottom: 5px;
-    text-align: right;
-    display: inline-table;
-    float: right;
-  }
-
-  .ct-table-inputnumber {
-    text-align: right;
+ 
+  .ct-form-repeat {
+    display: table;
+    background: aliceblue;
+    padding:10px;
   }
 
-  .ct-form-list .el-table__footer-wrapper .el-table__footer .has-gutter div {
-    text-align: right;
-  }
+    .ct-form-repeat .list-title {
+      padding-bottom: 5px;
+      text-align: left;
+      display: inline-table;
+      width: 45%;
+    }
 
-  .ct-form-list .el-table__footer-wrapper .el-table__footer .has-gutter tr td:first-child div {
-    text-align: left;
-  }
+    .ct-form-repeat .list-button {
+      padding-bottom: 5px;
+      text-align: right;
+      display: inline-table;
+      float: right;
+    }
+    .ct-form-repeat .ct-form-repeat-el-col {
+      border-bottom: 1px dashed #f1706b;
+    }
+      .ct-form-repeat .ct-form-repeat-el-col:last-child {
+        border-bottom: none;
+      }
 
-  .ct-table-required {
-    color: red;
-  }
 
-  .tableDisabled {
-    pointer-events: none;
-    opacity: 0.4;
-  }
 </style>

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

@@ -99,6 +99,8 @@
                 </ct-tablecurrency>
 
                 <!--正常的列-->
+                <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'" :style="column.style ? column.style:''">
                   {{row[column.id]}}
                 </div>
@@ -677,7 +679,7 @@
               if (field.pageStyle) {
                 submitData.pageStyle = field.pageStyle;
               }
-              self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model);
+              self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
@@ -903,11 +905,12 @@
     border-bottom: 1px solid #ebeef5;
     width: 100%;
     outline: 0;
+    border-top: 1px solid #fff;
   }
 
   .ct-searchtable .ct-table {
     min-width: 100%;
-    border-collapse: separate;
+    border-collapse: collapse;
   }
 
     .ct-searchtable .ct-table th {

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

@@ -30,17 +30,18 @@
             </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>
@@ -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;
@@ -241,7 +266,12 @@
     }
 
   .Stats-popover {
-      position:absolute;
-      right:5px;
+    position: absolute;
+    right: 5px;
+  }
+</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/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) {
               //合并表头时暂不支持固定列