centaline-data-driven 1.1.20 → 1.1.25

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

@@ -0,0 +1,29 @@
+<template>
+    <div>22222222222222222222222</div>
+</template>
+
+
+<script>
+  export default {
+    name: 'ct-PropertyDetail',
+    props: {
+      vmodel: Object,
+      api: String
+    },
+    data() {
+      return {
+        model:null
+      }
+    },
+    created() {
+      this.model = this.vmodel;
+    },
+    methods: {
+    }
+  }
+</script>
+<style>
+  
+</style>
+
+

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

@@ -1,9 +1,9 @@
 <template>
   <div v-loading="loading" style="width:100%">
-    <div v-if="model !== null && !loading" class="ct-form">
+    <div v-if="model !== null && !loading" class="ct-form"  :class="{'tableDisabled':model.pageDisabled}">
       <!--可根据场景判断显示el-card还是el-main-->
-      <component :is="showTitle?'el-card':'el-main'">
-        <div slot="header" class="clearfix" v-if="typeof model.title !== 'undefined' && showTitle">
+      <component :is="model.showTitle?'el-main':'el-card'">
+        <div slot="header" class="clearfix" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
           <span style="font-weight:bold">{{model.title}}</span>
         </div>
         <!--头部元素-->
@@ -93,7 +93,7 @@
       parentModel: Object,
       showTitle: {
         type: Boolean,
-        default: true
+        default: false
       }
     },
     data() {
@@ -136,7 +136,7 @@
         this.$emit('failLoad', this.model);
       },
       load(data) {
-        this.$set(this, 'model', data)
+        this.$set(this, 'model', data);
         this.model.self = this;
         if (typeof this.model.scripts !== 'undefined') {
           this.model.scripts.formData = this.model.formData;
@@ -234,9 +234,10 @@
 
               if (verified) {
                 //action有值，提交到后台
-                if (field.action) {
+                if (field.action) {                 
                   field.disabled = true;//提交按钮禁用
-                  field.doAction(self.model.getFormObj(), (data) => {
+                  self.model.pageDisabled= true;
+                  field.doAction(self.getFormObj(), (data) => {
                     if (data.rtnCode === 200) {
                       if (self.model.flagAlertClose) {
                         self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
@@ -262,7 +263,8 @@
                         self.parentModel.$vue.closeTabThen(data);
                       }
                     }
-                    field.disabled = false;
+                    field.disabled = false;                    
+                    self.model.pageDisabled= false;
                   });
                 }
                 //无值，触发submit事件
@@ -507,9 +509,23 @@
             f.self.resize();
           }
         });
-      }
+      },
+      getFormObj()
+      {
+        let formData=this.model.getFormObj();
+        if(this.$route.query.pageStyle)
+        {
+           return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
+        }
+        return formData;
+      },
+     
     }
   }
 </script>
 <style>
+.tableDisabled {
+    pointer-events: none;
+    opacity:0.4;
+  }
 </style>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="ct-form-list" :class="model.attrs.size?'ct-form-list-'+model.attrs.size:''">
-    <div style="padding-bottom:5px;text-align:right">
-      <el-button type="success" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">新增</el-button>
+    <div style="padding-bottom:5px;text-align:right" class=" max-btn-add">
+      <el-button type="success" size="mini" class="max-btn-add" icon="el-icon-circle-plus-outline" @click="addRow">新增</el-button>
     </div>
     <div style="position:relative">
       <div style="width:100%;overflow:auto;">

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

@@ -1,18 +1,25 @@
 <template>
-  <div class="ct-form-list" v-focus="foucus">
+  <div class="ct-form-list" v-focus="foucus" :class="{'tableDisabled':model.tableDisabled}">
     <div class="list-title">
       <h5>{{model.title}}</h5>
     </div>
-    <div class="list-button">
-      <el-button v-if="model.create" type="success" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">新增</el-button>
+    <div class="list-button max-btn-add">
+      <el-button v-if="model.create" type="success" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+        新增
+      </el-button>
     </div>
 
     <div id="listTable">
       <el-row>
         <el-col :span="24">
-          <el-table size="mini" :data="model.tableData" border style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
+          <el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
             <!--数据列-->
             <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false" header-align="center">
+              <template slot="header" slot-scope="scope">
+                <div class="cell" :class="{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled}">
+                  {{v.label}}
+                </div>
+              </template>
               <template slot-scope="scope">
                 <span v-if="scope.row.isSet">
                   <!--<component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :api="model.OptApi"></component>-->
@@ -59,13 +66,13 @@
     data: function () {
       return {
       }
-    },
-    methods: {
-      getClass() {
-        if (this.vmodel.is === "ct-inputNumber") {
-          return 'ct-table-inputnumber';
-        }
-      }
+    },
+    methods: {
+      getClass() {
+        if (this.vmodel.is === "ct-inputNumber") {
+          return 'ct-table-inputnumber';
+        }
+      }
     },
     template: '<div :class="getClass()">{{vmodel.labelValue}}{{vmodel.unitName}}</div>'
   }
@@ -83,6 +90,7 @@
       return {
         model: null,
         foucus: false,
+        itemKey: Math.random()
       }
     },
     created() {
@@ -156,7 +164,7 @@
 
               row.isSet = false;
               app.model.currentRow.isSet = false;
-
+              app.itemKey = Math.random();
               this.model.change = this.model.formListChange;
               app.$emit('change');
             }
@@ -172,14 +180,14 @@
       },
       //删除
       deleteRow(index, sourceIndex) {
-        var self = this;
+        var self = this;
         //判断是否已经保存所有操作
         for (let i of self.model.tableData) {
           if (i.isSet && self.model.currentRow.index !== index) {
             self.$message.warning("请先保存当前编辑项");
             return false;
           }
-        }
+        }
 
         this.model.deleteRow(sourceIndex, () => {
           self.model.tableData.splice(index, 1);
@@ -300,9 +308,9 @@
                   return Number(prev);
                 }
               }, 0);
-              //sums[index] += ' 元';
-              if (data[0][column.property].decimals && data[0][column.property].decimals > 0) {
-                sums[index] = sums[index].toFixed(data[0][column.property].decimals);
+              //sums[index] += ' 元';
+              if (data[0][column.property].decimals && data[0][column.property].decimals > 0) {
+                sums[index] = sums[index].toFixed(data[0][column.property].decimals);
               }
             } else {
               sums[index] = 'N/A';
@@ -328,12 +336,14 @@
     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;
@@ -341,13 +351,24 @@
     display: inline-table;
     float: right;
   }
+
   .ct-table-inputnumber {
-    text-align:right;
+    text-align: right;
   }
+
   .ct-form-list .el-table__footer-wrapper .el-table__footer .has-gutter div {
     text-align: right;
   }
+
   .ct-form-list .el-table__footer-wrapper .el-table__footer .has-gutter tr td:first-child div {
     text-align: left;
   }
+
+  .ct-table-required {
+    color: red;
+  }
+  .tableDisabled {
+    pointer-events: none;
+    opacity:0.4;
+  }
 </style>

package/src/centaline/dynamicHyperLink/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicHyperLink);
 }
 
-export default dynamicHyperLink
+export default dynamicHyperLink

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

@@ -50,6 +50,10 @@
       var self = this;
       this.$nextTick(function () {
 
+         if (typeof self.vmodel === 'undefined') {
+           self.model = self.loaderObj.InputNumber(this.source);
+         }
+      
         if (self.vmodel) {
           self.load(self.vmodel);
           self.$emit('loaded');

package/src/centaline/dynamicPlaceHolder/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicPlaceHolder);
 }
 
-export default dynamicPlaceHolder
+export default dynamicPlaceHolder

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchList.vue

@@ -23,7 +23,7 @@
       'ct-popupSearchListTable' : dynamicPopupSearchListTable
     },
     props: {
-      searchFormApi: String,
+      searchFormApi: String,
       apiParam: Object,
       searchDataApi: String,
       vmodel: Object,

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue

@@ -155,12 +155,12 @@
         }
       },
       confirmClickHandler() {
-        if (this.singleSelectio) {
+        if (this.singleSelectio) {
           if (this.currentRow) {
-            this.$emit('submit', this.currentRow);
-          }
-          else {
-            this.$message.error("请先选择数据");
+            this.$emit('submit', this.currentRow);
+          }
+          else {
+            this.$message.error("请先选择数据");
           }
         }
         else {
@@ -185,7 +185,7 @@
       searchComplate(searchModel) {
         var self = this;
         this.loading = true;
-        this.$nextTick(function () {
+        this.$nextTick(function () {
           if (typeof self.api !== 'undefined' && typeof searchModel !== 'undefined') {
             var postData;
             postData = searchModel.searchData;

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

@@ -1,7 +1,13 @@
 <template>
-  <div class="ct-search-list" :style="searchListStyle">
-    <ct-searchscreen ref="screen" :api="searchConditionApi" @loaded="screenLoaded" :screenPara="apiParam" @search="search()"></ct-searchscreen>
-    <ct-searchtable ref="table" :api="searchDataApi" @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"></ct-searchtable>
+  <div class="ct-search-list" :style="searchListStyle"> 
+    <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
+          <span style="font-weight:bold">{{title}}</span>
+    </div>
+    <ct-searchscreen ref="screen" :api="searchConditionApi" @loaded="screenLoaded" :screenPara="apiParam" @search="search()" @showTitle="showTitleScreenHandler"></ct-searchscreen>
+    <ct-searchtable ref="table" :api="searchDataApi" :searchDataStatisticsApi="searchDataStatisticsApi" 
+    @toolbarClick="toolbarClickHandler" 
+    @refreshParent="refreshParentHandler" 
+    @showTitle="showTitleHandler"></ct-searchtable>
   </div>
 </template>
 <script>
@@ -20,30 +26,33 @@
     props: {
       vmodel: Object,
       searchConditionApi: String,
-      searchDataApi: String,
+      searchDataApi: String,
+      searchDataStatisticsApi: String,
       pageHeight: String,
       apiParam: {
         type: Object,
         default: () => { }
-      }
+      },
     },
-    created() {
+    created() {
       this.model = this.vmodel;
-    },
-    computed: {
-      searchListStyle: function() {
-        if (this.pageHeight) {
-          return { 'height': this.pageHeight };
-        }
-        return {};
-      }
+    },
+    computed: {
+      searchListStyle: function() {
+        if (this.pageHeight) {
+          return { 'height': this.pageHeight };
+        }
+        return {};
+      }
     },
     data() {
       return {
         loaded: {
           screenLoaded: false,
           tableLoaded: false
-        }
+        },
+        title:'',
+        showTitle:false,
       }
     },
     methods: {
@@ -70,10 +79,22 @@
       },
       refreshParentHandler() {
         this.$emit('refreshParent');
-      },
-      resize() {
-        this.$refs.table.setTableHeight();
-      }
+      },
+      resize() {
+        this.$refs.table.setTableHeight();
+      },
+      showTitleHandler() {
+        if (this.$refs.table.model && this.$refs.table.model.flagShowTitle) {
+          this.title=this.$refs.table.model.title;
+          this.showTitle=this.$refs.table.model.flagShowTitle;
+        }
+      },
+      showTitleScreenHandler() {
+        if (this.$refs.screen.model && this.$refs.screen.model.flagShowTitle) {
+          this.title=this.$refs.screen.model.title;
+          this.showTitle=this.$refs.screen.model.flagShowTitle;
+        }
+      },
     }
   }
-</script>
+</script>

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -18,7 +18,7 @@
           <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
         </el-col>
       </el-row>-->
-      <el-popover class="SeachScreenPop" placement="top" transition="el-zoom-in-top" v-model="highScreen" trigger="click" visible-arrow="false">
+      <el-popover class="SeachScreenPop max-seachpopper" placement="top" transition="el-zoom-in-top" v-model="highScreen" trigger="click" visible-arrow="false">
         <div style="width:100%">
           <!--<el-row v-if="highScreenRow.length > 0">
             <el-col v-for="(col, index) in highScreenRow" :key="index" :span="col.colspan" style="padding:10px" v-if="col.show !== false">
@@ -78,6 +78,14 @@
         switch (model.action) {
           case 'showHigh':
             this.$set(this, 'highScreen', !this.highScreen);
+            //高级搜索需要切换icon样式
+            if(model.icon==='max-open')
+            {
+              model.icon='max-fold'
+            }else
+            {
+              model.icon='max-open'
+            }
             break;
           case 'search':
             this.$emit('search', this.model);
@@ -123,13 +131,13 @@
             v.parent = parent;
           }
         });
-      },
+      },
       //无任何筛选条件时，不显示该div
-      setScreenShow() {
+      setScreenShow() {
         let showField = this.model.screen.find((v) => {
           return v.show !== false;
         });
-        if (!showField) {
+        if (!showField) {
           showField = this.model.btnScreen.find((v) => {
             return v.show !== false;
           });
@@ -147,6 +155,7 @@
         self.setScreenShow();
         self.isLoading = false;
         self.$emit('loaded', self.model.defaultSearch);
+        self.$emit('showTitle');
       }
     }
   }
@@ -163,7 +172,7 @@
     box-shadow: none;
     -webkit-box-shadow: none;
     border-radius: 0px;
-    background-color: #fafafa;
+    background-color: #fafafa;
     z-index:1990;
   }
     .SeachScreenPop .el-popper .el-time-panel {