gyyg-components 0.3.23 → 0.3.25

package/package.json

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

package/src/components/MECDefaultText/MECDefaultText.vue

@@ -1,10 +1,10 @@
 <template>
-    <div :class="textType == 'littleTitle' ? 'title' : ''">{{ value }}</div>
+    <div :class="textType == 'littleTitle' ? 'title' : ''" :style="style">{{ value }}</div>
 </template>
 <script>
 export default {
     name: 'mec-defaultText',
-    props:['value', 'textType']
+    props:['value', 'textType', 'style']
 }
 </script>
 <style lang="less" scoped>

package/src/components/MecDialog/MecDialog.vue

@@ -17,24 +17,19 @@
       @closed="closed"
       @close="closeMethod"
       :destroy-on-close="destroyOnClose"
-      :modal='modal'
+      :modal="modal"
+      :close-on-press-escape="false"
       ref="dialog"
     >
-      <div
-        slot="title"
-        style="font-size: 16px; color: #303133;"
-      >
+      <div slot="title" style="font-size: 16px; color: #303133">
         <el-icon
           :class="titleIcon"
-          style="color: #1890ff; font-size: 18px;margin-right: 5px;"
+          style="color: #1890ff; font-size: 18px; margin-right: 5px"
         ></el-icon>
         <span>{{ title }}</span>
       </div>
       <slot name="body" />
-      <div
-        v-if="footer"
-        slot="footer"
-      >
+      <div v-if="footer" slot="footer">
         <slot name="footer" />
       </div>
     </el-dialog>
@@ -84,12 +79,12 @@ export default {
     // 是否显示叉号
     showClose: {
       default: true,
-      type: Boolean
+      type: Boolean,
     },
     //是否需要遮罩层
     modal: {
       default: true,
-      type: Boolean
+      type: Boolean,
     },
     dragDialog: {
       type: Boolean,
@@ -97,16 +92,16 @@ export default {
     },
     dialogClass: {
       type: String,
-      default: ""
+      default: "",
     },
     titleIcon: {
       type: String,
-      default: '',
+      default: "",
     },
     height: {
       type: String,
-      default: 'auto'
-    }
+      default: "auto",
+    },
   },
   data() {
     return {
@@ -116,7 +111,10 @@ export default {
   },
   computed: {
     customClass() {
-      let className = this.height !== 'auto' ? 'haveHeight-dialog' : this.dialogClass;
+      let className =
+        this.height !== "auto"
+          ? this.dialogClass + " haveHeight-dialog"
+          : this.dialogClass;
       return className;
     },
   },
@@ -127,13 +125,12 @@ export default {
   methods: {
     open() {
       this.visible = true;
-      console.log(this.height)
-      if(this.height !== 'auto' && this.height) {
+      console.log(this.height);
+      if (this.height !== "auto" && this.height) {
         this.$nextTick(() => {
           this.$refs.dialog.$el.firstElementChild.style.height = this.height;
         });
       }
-      
     },
     close() {
       this.visible = false;
@@ -194,6 +191,9 @@ export default {
       padding: 20px;
       padding-bottom: 52px;
       height: calc(100% - 50px);
+      .el-tabs {
+        margin-top: -10px;
+      }
     }
 
     .el-dialog__footer {
@@ -221,7 +221,6 @@ export default {
     }
 
     .custom-table {
-
       // 取消表格下边线
       tbody tr:last-child td {
         border-bottom: none !important;

package/src/components/MecDrawer/MecDrawer.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer :visible.sync="searchDrawerVisible" direction="rtl" :before-close="handleBeforeClose" :modal="true"
+    <el-drawer :visible.sync="searchDrawerVisible" direction="rtl" :before-close="handleBeforeClose" :modal="modal"
       icon="el-icon-search" :size="width">
       <!-- 标题区域 -->
       <div slot="title" class="drawer-title">
@@ -33,6 +33,10 @@ export default {
     title: {
       type: String,
       default: '筛选'
+    },
+    modal: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

package/src/components/MecForm/MecForm.vue

@@ -23,7 +23,7 @@
           :label-width="item.labelWidth"
         >
           <template slot="label">
-            <span v-if="item.label">
+            <span v-if="item.label || item.isNotLabelShow">
               <span :style="'color:' + item.labelColor">{{ item.label }}</span>
               <el-tooltip
                 v-if="item.tooltip"
@@ -40,10 +40,10 @@
             :is="item['componentName']"
             v-model="item.value"
             :value.sync="item.value"
-            :otherValue.sync="item.otherValue"                                                                        
+            :otherValue.sync="item.otherValue"
             :delIdList.sync="item.delIdList"
             v-bind="item"
-            v-on="item.componentListeners"
+            v-on="typeof item.componentListeners === 'function' ? item.componentListeners(formData, item) : item.componentListeners || {}"
             :ref="item.componentRef"
           ></component>
         </el-form-item>
@@ -113,7 +113,6 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-
 ::v-deep.el-form::after {
   content: "";
   display: table;
@@ -126,5 +125,8 @@ export default {
   .el-form-item {
     margin-bottom: 12px;
   }
+  .el-form-item__label {
+    display: inline;
+  }
 }
 </style>

package/src/components/MecInputTable/MecInputTable.vue

@@ -75,7 +75,7 @@ export default {
         },
         toggleRow: {
             type: Boolean,
-            default: true
+            default: false
         },
         value: {
            default: '' 

package/src/components/MecRadio/MecRadio.vue

@@ -19,6 +19,7 @@
       v-model="inputValue"
       :disabled="inputDisabled"
       placeholder="请输入"
+      @input="inputChange"
       style="display: inline-block; margin-top: 10px"
     />
     <!-- @input="inputChange" -->
@@ -143,6 +144,9 @@ export default {
         this.props.label
       ];
     },
+    inputChange(val){
+      this.$emit("otherInput", val)
+    }
   },
 };
 </script>

package/src/components/MecTable/MecTable.vue

@@ -37,7 +37,7 @@
                 type="index"
                 width="50">
             </el-table-column>
-            <template v-for="(col, index) in column">
+            <template v-for="(col, index) in filteredColumns">
                 <el-table-column
                     v-if="!col['type'] && (!col.headerList || col.headerList.length === 0)"
                     :label="col.label"
@@ -50,6 +50,7 @@
                     :key="col.id"
                     :fixed="col.fixed"
                     :prop="col.bind"
+                
                 >
                     <template
                         slot="header"
@@ -279,6 +280,11 @@ export default {
             column: []
         }
     },
+    computed: {
+        filteredColumns() {
+            return this.columns.filter(item => !item.showColumns || item.showColumns(item))
+        }
+    },
     methods: {
         // 列表选中当前行字体加粗
         selectedRowStyle({ row }) {

package/src/components/MecTabs/MecTabs.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-tabs v-model="activeName" v-bind="$attrs" @tab-click="handleClick">
+        <el-tabs v-model="activeName" v-bind="$attrs" @tab-click="handleClick" :type="type">
             <el-tab-pane 
                 v-for="(item, index) in tabList" 
                 :key="index+item.label"
@@ -37,6 +37,10 @@ export default {
 				};
 			},
 		},
+        type: {
+            type: String,
+            default: ''
+        }
     },
     data() {
         return {