centaline-data-driven 1.1.20 → 1.1.25

package/src/centaline/api/index.js

@@ -172,10 +172,15 @@ const api = {
 
     if (data.rtnCode === Enum.ReturnCode.Successful) {
       if (data.rtnMsg) {
-        Vue.prototype.$message({
-          message: response.data.rtnMsg,
-          type: 'success'
-        });
+        if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {
+          common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
+        }
+        else {
+          Vue.prototype.$message({
+            message: response.data.rtnMsg,
+            type: 'success'
+          });
+        }
       }
 
       if (data.notification === Enum.ActionType.Export && data.content) {//导出
@@ -204,7 +209,12 @@ const api = {
     }
     else {
       if (response.data.rtnMsg && common.getDataDrivenOpts().showRequestErrorMessage) {
-        Vue.prototype.$message.error(response.data.rtnMsg);
+        if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {
+          common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
+        }
+        else {
+          Vue.prototype.$message.error(response.data.rtnMsg);
+        }
       }
       return Promise.reject(response);
     }

package/src/centaline/comfirm/src/comfirm.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="ct-comfirm-content">
+  <div class="ct-comfirm-content max-comfirm-content">
     <div style="margin-top: 15px;margin-bottom: 15px;min-width: 150px;text-align: center;">
       <span>{{text}}</span>
     </div>
     <div style="text-align:center;width:100%">
       <el-button @click="clickHandler($event,true)"  type="primary" size="mini">{{options.confirmButtonText||'确定'}}</el-button>
-      <el-button @click="clickHandler($event,false)"  size="mini">{{options.cancelButtonText||'取消'}}</el-button>
+      <el-button v-if="options.flagShowcCancelButton===undefined || options.flagShowcCancelButton==='1'" @click="clickHandler($event,false)"  size="mini">{{options.cancelButtonText||'取消'}}</el-button>
     </div>
   </div>
 </template>

package/src/centaline/css/common.css

@@ -340,8 +340,8 @@ html {
   *display: inline;
   zoom: 1;
   height: 24px;
+  line-height: 24px;
   float: left;
-  margin-top: 4px;
  }
  
  .ct-table table {
@@ -417,12 +417,10 @@ html {
  
  
  /*主要按钮*/
- /* .el-button{
-  color: #fff;
-  background-color: #b3caf5;
+ .el-button{
   border: none;
 }
-.el-button:active {
+/*.el-button:active {
   background-color: #b3caf5;
   border: none;
   color: #fff;
@@ -434,49 +432,49 @@ html {
 
 } */
  .el-button--primary {
-   background-color: #ee5d56;
-   border-color: #ee5d56;
+   background-color: #EE6B6B ;
+   /* border-color: #EE6B6B ; */
  }
  .el-button--primary:hover ,.el-button--warning:hover{
    background: #f1706b;
-   border-color: #f1706b;
+   /* border-color: #f1706b; */
    color: #FFF;
  }
  .el-button--primary:focus {
    background: #de534d;
-   border-color: #de534d;
+   /* border-color: #de534d; */
    color: #FFF;
  }
  .el-button--success {
-   background-color: #ee5d56;
-   border-color: #ee5d56;
+   background-color: #EE6B6B ;
+   /* border-color: #EE6B6B ; */
  }
  
  .el-button--success:focus {
    background: #de534d;
-   border-color: #de534d;
+   /* border-color: #de534d; */
    color: #FFF;
  }
  .el-button--success:hover {
    background: #f1706b;
-   border-color: #f1706b;
+   /* border-color: #f1706b; */
    color: #FFF;
  }
 /* 工具栏按钮置灰 */
-.ct-tableToolbar .el-button--primary {
-    border: 1px solid #ced0d9!important;
-    background: -webkit-linear-gradient(top, #fff, #f2f4f7);
-    color: #333!important;
-}
-.ct-tableToolbar .el-button--primary:hover{
-    color: #666!important;
-    border: 1px solid #ced0d9!important;
-    background: linear-gradient(#F4F4F5,#DFE3F1)!important;
-}
-.ct-tableToolbar .el-button--primary:focus{
-  border: 1px solid #ced0d9!important;
-  background: -webkit-linear-gradient(top, #fff, #f2f4f7)!important;
-  color: #333!important;
+.ct-tableToolbar button {
+    border: 1px solid #ced0d9;
+    background-color: #f2f4f7;
+    color: #333;
+}
+.ct-tableToolbar button:hover{
+    color: #666;
+    border: 1px solid #ced0d9;
+    background: linear-gradient(#F4F4F5,#DFE3F1);
+}
+.ct-tableToolbar button:focus{
+  border: 1px solid #ced0d9;
+  background: -webkit-linear-gradient(top, #fff, #f2f4f7);
+  color: #333;
 }
 .ct-option.el-tag.el-tag--danger {
   background-color: #fff;
@@ -554,23 +552,23 @@ html {
   width: 100%;
   height: 100%;
   position: inherit;
-  background: #c8c8c8;
-  padding: 10px;
+  background: #eceff2;
+  padding: 0px;
 }
 
 .st-serach-screen {
   background: #fff;
   width: 100%;
   position: relative;
-  border-radius:3px;
+  border-radius:6px;
 }
 
 .ct-searchtable{
   margin-top: 10px;
-  padding: 0 0px 0 0px;
+  padding: 20px 0px 0 0px;
   background: #fff;
   -webkit-box-sizing: border-box;
-  border-radius:3px;
+  border-radius:6px;
 
 }
 
@@ -648,7 +646,7 @@ html {
   min-width: initial!important;
 }
 .ct-ptb5{
-  padding: 5px 0;
+  padding: 10px;
 }
 /* 导航栏经过选中时 */
 .el-col .ct-search-list{
@@ -712,4 +710,7 @@ html {
 .ct-right-10{
   right: 10px !important;
 }
+.ct-table-content{
+  padding: 0 15px;
+}
 

package/src/centaline/css/max.css

@@ -0,0 +1,145 @@
+
+/* 查询搜索 */
+.max-search-btn{
+    height: 26px;
+    background: #EE6B6B;
+    box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
+    border-color: #EE6B6B;
+    border-radius: 6px;
+
+}
+.max-search-btn:hover{
+   background-color:#FF9393;
+   border-color: #FF9393;
+}
+.max-search-btn:active,.max-search-btn:focus{
+    background-color: #B33136;
+    border-color: #B33136;
+}
+/* 重置按钮 */
+.max-reset-btn{
+    height: 26px;
+    background: #519DA6;
+    border-color: #519DA6;
+    box-shadow: 0px 2px 4px 0px rgba(82,157,166,0.25);
+    border-radius: 6px;
+}
+.max-reset-btn:hover{
+    background-color:#85CAD2;
+    border-color: #85CAD2;
+ }
+ .max-reset-btn:active.max-reset-btn:focus{
+     background-color: #35838C;
+     border-color: #35838C;
+ }
+/* 工具栏按钮 */
+.max-ToolbarButton{
+    margin-right: 10px!important;
+}
+.max-ToolbarButton .max-btn-gray{
+    height: 26px;
+    background: #FFFFFF;
+    border: 1px solid #CCCCCC;
+    border-radius: 6px;
+}
+/* 弹层新增按钮 */
+.max-btn-add button{ /*list-button*/
+    height: 26px;
+    background: #EE6B6B;
+    box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
+    border-radius: 6px;
+}
+.max-btn-add button:hover{
+    background-color:#FF9393;
+    border-color: #FF9393;
+}
+.max-btn-add button:focus,.max-btn-add button:active{
+    background-color: #B33136;
+    border-color: #B33136;
+}
+.max-comfirm-content button{
+    height: 26px;
+    border-radius: 6px;
+}
+/* 弹层内属性、输入框 */
+.max-input-group{/*elinput-group*/
+    border-top-left-radius: 6px;
+    border-bottom-left-radius: 6px;
+    line-height: 24px;
+}
+.max-flex-div{
+    display: flex;
+}
+
+.max-input input{ /*el-input__inner*/
+    height: 26px!important;
+    line-height: 26px!important;
+    border-radius: 6px!important;
+    background: #FFFFFF;
+    border: 1px solid #E0E0E0;
+    padding: 0 15px 0 5px;
+}
+.inputError .el-input-group__prepend{
+    color: #ff5b5b!important;
+}
+
+/* 弹层表格样式 */
+.max-table--border{
+    border-left: 1px solid #F0F0F0;
+    border-right: none!important;
+    border-bottom: none!important;
+}
+/* 高级查询样式 */
+.max-seachpopper .el-popper{ /*SeachScreenPop*/
+    padding: 5px 10px 10px 10px!important;
+    background-color: #fff !important;
+    margin-top: -5px;
+    border-bottom-left-radius: 6px !important;
+    border-bottom-right-radius: 6px !important;
+    -webkit-box-shadow: #cfcece 0px  7px 9px 0px!important;
+
+}
+.ct-checkbox .ct-checkbox-mian{
+    padding-left: 0!important;
+}
+.cover-list-item .el-checkbox{
+    margin-right: 10px!important;
+}
+
+.max-open{
+    background: url(../../assets/max-open.png)no-repeat;
+    background-size: 100% 100%;
+    height: 12px;
+    width: 14px;
+    display: inline-block;
+    float: left;
+    margin-right: 2px;
+}
+.max-fold{
+    background: url(../../assets/max-fold.png)no-repeat;
+    background-size: 100% 100%;
+    height: 12px;
+    width: 14px;
+    display: inline-block;
+    float: left;
+    margin-right: 2px;
+}
+
+.ct-tableParent::-webkit-scrollbar-thumb{
+    display: block;
+    background-color:#bebebe;
+    height:5px;
+    border-radius:4px
+}
+.ct-tableParent::-webkit-scrollbar{
+    display: block;
+    width:6px;
+    height:6px;
+    background-color:#f1f1f1
+}
+.ct-table .cell:last-child{
+    white-space: nowrap;
+}
+.max-cover-list-item .el-input__icon{
+    line-height: 40px!important;
+}

package/src/centaline/dialogList/src/dialog.vue

@@ -97,7 +97,7 @@
                               class: ['ct-dialog_header'],
                               style: {
                                 'position': 'relative',
-                                'padding': '10px 20px 10px 20px',
+                                'padding': '10px 20px 10px 20px',
                                 'height': '44px'
                               },
                             }, [
@@ -132,7 +132,7 @@
                                       item.on.loaded = (model) => {
                                         mySelf.vmodel.title = (model && model.title) ? model.title : mySelf.vmodel.title
                                       }
-                                    }
+                                    }
 
                                     //加载失败关闭弹框
                                     if (typeof item.on.failLoad === "undefined") {

package/src/centaline/dialogList/src/dialogNew.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="ct-dialog">
-    <el-dialog :top="topHeigth"
+    <el-dialog :top="topHeigth"
                :title="vmodel.title" :close-on-click-modal="false"
                :visible.sync="dialogVisible"
                :width="vmodel.content[0].attrs.width"
-               :before-close="handleClose">
+               :before-close="handleClose">
       <div :style="v.style" v-for="(v,index) in vmodel.content" :key="index">
         <component v-bind="v.attrs" :is="v.component" v-on="v.on"></component>
       </div>
@@ -26,10 +26,10 @@
     },
     mounted() {
       for (var index in this.vmodel.content) {
-        const v = this.vmodel.content[index];
-        if (v.component === 'ct-searchlist' && parseInt(v.attrs.height) < 300) {
-          v.attrs.height = '450px';
-        }
+        const v = this.vmodel.content[index];
+        if (v.component === 'ct-searchlist' && parseInt(v.attrs.height) < 300) {
+          v.attrs.height = '450px';
+        }
 
         this.$set(v, 'style', {
           width: '100%',
@@ -49,23 +49,23 @@
     computed: {
       topHeigth: function () {
         let height;
-        let vh = 0;
+        let vh = 0;
         this.vmodel.content[0].attrs.height = '50px';
         if (this.vmodel.content[0].attrs.height) {
           height = parseInt(this.vmodel.content[0].attrs.height) + 20;
         }
         if (document.documentElement.clientHeight > height) {
-          height = document.documentElement.clientHeight - height;
+          height = document.documentElement.clientHeight - height;
           height = parseInt(height/2);
-          vh = height * 100 / document.documentElement.clientHeight;
+          vh = height * 100 / document.documentElement.clientHeight;
           vh = parseInt(vh);
-        }
-        if (vh < 3) {
-          vh = 3;
-        }
-        if (vh > 13) {
-          vh = 13;
-        }
+        }
+        if (vh < 3) {
+          vh = 3;
+        }
+        if (vh > 13) {
+          vh = 13;
+        }
         return vh + 'vh';
       },
     },

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

@@ -1,8 +1,26 @@
 <template>
-  <el-button v-if="!model.isImport"
-             :type="model.isHyperLink ? 'text' : 'primary'"
-             v-bind="model.attrs" @click="$emit('click',model)"
-             :disabled="model.disabled">{{model.label}}</el-button>
+  <el-dropdown v-if="model.isDropdown" 
+               trigger="click" 
+               v-bind="model.attrs"  
+               placement="bottom"
+               @click.native="dropClick" 
+               @command="commandClick"
+               :disabled="model.disabled">
+    <el-button type="primary">
+      {{model.label}}<i class="el-icon-arrow-down el-icon--right"></i>
+    </el-button>
+    <el-dropdown-menu slot="dropdown">
+      <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
              :action="model.action"
              v-bind="model.attrs"
@@ -22,7 +40,8 @@
     name: 'ct-btn',
     props: {
       vmodel: Object,
-      fileData: Object
+      fileData: Object,
+      optionApi:String,
     },
     mixins: [dynamicElement],
     data: function () {
@@ -36,26 +55,26 @@
         this.model = this.vmodel;
       }
     },
-    computed: {
-      uploadData() {
-        //因传输方式是FormData，故需要对Value是object的进行转化
-        let data = {};
-        for (var key in this.fileData) {
-          if (typeof this.fileData[key] === "object") {
-            data[key] = JSON.stringify(this.fileData[key]);
-          }
-          else {
-            data[key] = this.fileData[key];
+    computed: {
+      uploadData() {
+        //因传输方式是FormData，故需要对Value是object的进行转化
+        let data = {};
+        for (var key in this.fileData) {
+          if (typeof this.fileData[key] === "object") {
+            data[key] = JSON.stringify(this.fileData[key]);
           }
-        }
-        return data;
+          else {
+            data[key] = this.fileData[key];
+          }
+        }
+        return data;
       },
       headers() {
         return this.$common.getDataDrivenOpts().handler.getRequestHeaders();
       }
     },
     methods: {
-      handleAvatarSuccess(res) {
+      handleAvatarSuccess(res) {
         let self = this;
         this.$api.postThenHandler({ data: res}).then(function () {
           self.$emit('importComplete', res);
@@ -63,7 +82,19 @@
       },
       handleAvatarError(info) {
         this.$message.warning("失败,请重试");
-      }
+      },
+      dropClick(event) {
+        var self = this;
+        this.$nextTick(function () {          
+          if (self.optionApi) {
+            self.model.getOptions(self.optionApi);
+          }
+        });
+      },
+      commandClick(code){
+        this.model.selectOptionCode=code;
+        this.$emit('click', this.model);
+      },
     }
   }
 </script>

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

@@ -12,7 +12,7 @@
             </el-checkbox-group>
           </span>
 
-          <span v-if="!model.lock" class="cover-list-item-span">
+          <span v-if="!model.lock" class="cover-list-item-span max-cover-list-item">
           <i class="el-input__icon el-icon-circle-close" @click="clearClickHandle"></i>
         </span>
         </div>

package/src/centaline/dynamicDetail/index.js

@@ -0,0 +1,11 @@
+import dynamicDetail from './src/dynamicDetail'
+
+dynamicDetail.install = function (Vue) {
+  Vue.component(dynamicDetail.name, dynamicDetail);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicDetail);
+}
+
+export default dynamicDetail;

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

@@ -0,0 +1,39 @@
+<template>
+    <div>
+      <ct-PropertyDetailOFI class="ct-PropertyDetailOFI"  v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
+      <ct-PropertyDetailRET class="ct-PropertyDetailRET"  v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
+    </div>
+</template>
+
+<script>
+  import dynamicPropertyDetailOFI from './dynamicPropertyDetailOFI'
+  import dynamicPropertyDetailRET from './dynamicPropertyDetailRET'
+  export default {
+    name: 'ct-Detail',
+    components: {
+      'ct-PropertyDetailOFI': dynamicPropertyDetailOFI,
+      'ct-PropertyDetailRET': dynamicPropertyDetailRET,
+    },
+    props: {
+      vmodel: Object,
+      api: String,
+      pageType: String,
+    },
+    data() {
+      return {
+        model:null,
+      }
+    },
+    created() {
+      this.model = this.vmodel;
+    },
+    methods: {
+    }
+  }
+</script>
+<style>
+  
+</style>
+
+
+