centaline-data-driven 1.2.35 → 1.2.36

package/package.json

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

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

@@ -244,7 +244,7 @@
         var self = this;
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
-        
+                   
         var clickAcion = function (field) {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
@@ -262,6 +262,9 @@
                     self.model.pageDisabled= true;
                     field.doAction(self.getFormObj(), (data) => {
                       if (data.rtnCode === 200) {
+                        if(data.notification===17){
+                          self.clickHandler(self.model.getRtnRouter(data.content),null)
+                        }
                         if (self.model.flagAlertClose) {
                           self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
                             confirmButtonText: '确定',
@@ -397,7 +400,7 @@
             }
             submitData = field.getActionPara(submitData).para;
             let title=field.pageTitle==undefined ?field.label:field.pageTitle;
-            submitData.actionType=field.actionType;
+            submitData.actionType=field.actionType; 
             var fun =self.$common.getDataDrivenOpts().handler[field.action];
             fun(submitData,title,self.model);
           }
@@ -572,8 +575,7 @@
            return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
         }
         return formData;
-      },
-     
+      },     
     }
   }
 </script>

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

@@ -3,7 +3,7 @@
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header"
                    v-if="!isLoading&&searchStatsApi"
                    :api="searchStatsApi"
-                   @searchStats="searchStats"
+                   @searchStats="searchStats"  @setTableHeight="setTableHeight"
                    :searchModel="model.searchModel"></ct-tableStats>
     <ct-tabletoolbar ref="toolbar" v-if="!isLoading" :buttons="model.buttons"
                      @click="toolbarClickHandler($event)"
@@ -505,7 +505,9 @@
             var h4 = this.$refs.footer.$el.offsetHeight | 0;
             var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
             var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - 22;
+              var h7 =  this.$refs.tableStats?(this.$refs.tableStats.$el.offsetHeight+7 | 0):0;
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7-22;
+            console.log(tableHeight+"   "+h7);
             this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             this.$nextTick(() => {
               self.getScrollAttr();

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

@@ -4,21 +4,25 @@
     <!--计算占用宽度-->
     <div style="position:relative" v-if="FlagStatistics">
       <div style="position:absolute;left:-10000px" class="tab-list">
-        <label v-for="(item, index) in data" class="btnTab" :class="[selectStats==item.code1?'active':'']" :ref="'StatisticsItem'+index">{{item.controlLabel}}</label>111
+        <label v-for="(item, index) in data" class="btnTab"  :ref="'StatisticsItem'+index">
+         <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>111
       </div>
     </div>
     <!--展示-->
     <div v-if="FlagStatistics" class="tab-list">
       <template v-if="showData.length===1">
-        <label class="btnTab" v-for="(item, index) in showData[0]" :class="[selectStats==item.code1?'active':'']" @click="handleClick($event,item)">{{item.controlLabel}}</label>
+        <label class="btnTab" v-for="(item, index) in showData[0]"  @click="handleClick($event,item)">
+          <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
       </template>
       <template v-else-if="showData.length>1">
-        <label class="btnTab" v-for="(item, index) in showData[0]" :class="[selectStats==item.code1?'active':'']" @click="handleClick($event,item)">{{item.controlLabel}}</label>
+        <label class="btnTab" v-for="(item, index) in showData[0]"  @click="handleClick($event,item)">
+         <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
         <el-popover :append-to-table="option.appendId?option.appendId:''"
                     :placement="option.placement?option.placement:'left'"
                     :trigger="option.trigger?option.trigger:''"
                     class="tabl-el">
-          <label class="tablf" v-for="(item, index) in showData[1]" :class="[selectStats==item.code1?'active':'']" @click="handleClick($event,item)">{{item.controlLabel}}</label>
+          <label class="tablf" v-for="(item, index) in showData[1]"  @click="handleClick($event,item)">
+          <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
           <i slot="reference" class="icon-more"></i>
 
         </el-popover>
@@ -68,7 +72,6 @@
         self.selectVa = "";
         if (self.data.length > 0) {
           if (self.selectStats == []) {
-            debugger
             self.selectStats = self.data[0].code1;
           }
           self.FlagStatistics = true;
@@ -111,12 +114,14 @@
             }
 
           }
+
+ self.$emit('setTableHeight');
         });
       },
       handleClick(ev, obj) {
         var self = this;
         self.selectStats = obj.code1;
-        var fields = self.model.searchData(obj.fieldName1, obj.code1, obj.controlType, obj.searchDataType);
+        var fields = self.model.searchData(obj.fieldName1, obj.code1, obj.searchOperation, obj.searchDataType);
         var model = {
           "searchData": fields
         };
@@ -147,42 +152,46 @@
 <style>
 </style>
 
-<style>
-
+<style> 
   .tab-list {
-    height: 30px;
-    border-bottom: 1px solid #E0E0E0;
+    border-bottom: 2px solid #E0E0E0;
     margin-bottom: 10px;
+        padding-bottom: 5px;
   }
 
-  .btnTab {
+  .tab-list .btnTab {
     font-size: 14px !important;
     font-weight: bold;
-    padding: 5px 20px;
+    padding: 0px 20px 0px 20px;
+ 
+
   }
 
-    .btnTab:hover ,.tablf:hover{
+   .tab-list .btnTab:hover ,.tab-list .tablf:hover{
       color: #ee5d56;
     }
-    .tabl-el{
+    .tab-list .tabl-el{
       max-width: 150px;
       box-shadow: 0 6px 12px rgb(0 0 0 / 18%);
     }
-  .tablf{
+  .tab-list  .tablf{
     font-size: 14px !important;
     font-weight: bold;
     text-align: center;
     padding: 5px 10px;
     display: block;
   }
-  .active {
+ .tab-list .active {
     color: #ee5d56 !important;
     border-bottom: solid 3px #ee5d56 !important;
-    background: none;
+    background: none; 
     border-radius: 0 !important;
   }
+  .tab-list .btnTab span{
+ 
+  }
 
-  .icon-more {
+ .tab-list .icon-more {
     background: url(../../../assets/vertical.png)no-repeat;
     background-size: 80% 80%;
     height: 20px;

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

@@ -348,7 +348,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           rtn = true;
         }
         return rtn;
-      }
+      },
+      getRtnRouter(v){
+        var button = Router(v);
+        button.is = "ct-btn";
+        return button;
+      },
     };
     valid.InitForm(rtn);
     return rtn;

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -356,9 +356,14 @@ const Enum = {
     CloseTabThenUpdate: 16,
 
     /// <summary>
-    ///  指示前端列表刷新当前行数据
+    ///  路由
     /// </summary>
-    RefreshCurrentRow: 17,
+    Router: 17,
+
+    /// <summary>
+    ///  替换当前表单内容
+    /// </summary>
+    Replace: 18,
   },
 
   /// <summary>