gyyg-components 0.2.24 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gyyg-components",
-  "version": "0.2.24",
+  "version": "0.3.0",
   "private": false,
   "main": "lib/gyyg-components.umd.js",
   "scripts": {

package/src/components/MECDescriptions/MECDescriptions.vue

@@ -12,7 +12,6 @@
                 <div class="title">{{ title }}</div>
                 <div class="top-content">
                     <slot name="topContent"></slot>
-
                 </div>
             </template>
 
@@ -21,6 +20,11 @@
                 :key="index"
                 :label="item.label"
                 :span="item.span || 1"
+                :contentClassName="item.contentClassName || ''"
+                :labelStyle="{width:labelWidth + 'px', textAlign: 'right'}"
+                :contentStyle="item.contentStyle || {}"
+                :labelClassName="item.labelClassName || ''"
+
             >
                 <div v-if="item.type === 'img'">
                     <el-image
@@ -96,7 +100,12 @@ export default {
         border: {
             type: Boolean,
             default: false
-        }
+        },
+        labelWidth: {
+            type: [Number, String],
+            default: 100
+        },
+
     },
 }
 </script>
@@ -135,4 +144,7 @@ export default {
 /deep/ .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
     white-space: pre-wrap;
 }
+/deep/ .el-progress-bar {
+    width: 200px
+}
 </style>

package/src/components/MecForm/MecForm.vue

@@ -87,5 +87,13 @@ export default {
 	display: table;
 	clear: both;
 }
+::v-deep.el-form--label-top {
+	.el-col {
+		padding-right: 15px;
+	}
+	.el-form-item {
+		margin-bottom: 12px;
+	}
+}
 
 </style>

package/src/components/MecTable/MecTable.vue

@@ -67,6 +67,7 @@
                     :key="index + 'header'"
                     :fixed="col.fixed"
                     :min-width="col.minWidth"
+                    :align="col.align"
                 >
                     <el-table-column
                         v-for="(item, subIndex) in col.headerList"
@@ -138,6 +139,7 @@
                 :current-page="page.currentPage"
                 layout="total, sizes, prev, pager, next, jumper"
                 :total="page.totalRecords"
+                :background="paginationBackGround"
             ></el-pagination>
         </div>
     </div>
@@ -230,7 +232,11 @@ export default {
         border: {
             type: Boolean,
             default: true
-        }
+        },
+        paginationBackGround: {
+            type: Boolean,
+            default: true
+        }   
 
     },
     data() {
@@ -306,10 +312,35 @@ export default {
 
 .pagination-layout {
     text-align: right;
-    height: 35px;
+    padding: 0px 10px 5px 0;
+    /deep/ .el-pagination .el-select .el-input .el-input__inner {
+        height: 28px;
+        line-height: 28px !important;
+        min-height: 28px !important;
+    }
+    /deep/ .el-pagination__editor.el-input .el-input__inner {
+        height: 28px;
+        line-height: 28px !important;
+        min-height: 28px !important;
+    }
 }
 
 /deep/ .el-table td.el-table__cell {
     border-right: none;
 }
+.pagination-layout {
+    // .el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li
+    /deep/ .el-pagination.is-background {
+        .btn-next, .btn-prev, .el-pager li { 
+            border: 1px solid #d7dae2;
+            background-color: #fff;
+            color: #606266;
+        }
+        .el-pager li:not(.disabled).active {
+            border: 1px solid #409eff;
+            background-color: #409eff;
+            color: #fff;
+        }
+    }
+}
 </style>

package/src/otherComponents/styleText.vue

@@ -2,7 +2,7 @@
     <div>
         <span class="default-text" :style="[statusStyle]" v-if="tableData.columnType == 'text'"
             :class="tableData.getClass ? tableData.getClass(scope.row) : ''">{{ getText(tableData.bind) }}</span>
-        <el-button v-if="tableData.columnType == 'button'" size="mini" plain round :type="tableData.setType(this.scope.row)">{{ getText(tableData.bind) }}</el-button>
+        <el-button v-if="tableData.columnType == 'button' && getText(tableData.bind)" size="mini" plain round :type="tableData.setType(this.scope.row)">{{ getText(tableData.bind) }}</el-button>
     </div>
 </template>
 <script>