meixioacomponent 0.3.62 → 0.3.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.3.62",
+  "version": "0.3.65",
   "private": false,
   "author": "YuRi",
   "main": "lib/meixioacomponent.umd.min.js",

package/packages/components/proForm/proForm/pro_form_item.vue

@@ -325,13 +325,15 @@ export default {
 
         case 'select':
           let list = this.selectData
+          const selectConfig = this.selectConfig
           if (list.length > 0) {
             if (!this.multiple) {
               if (this.module) {
                 let index = list.findIndex((item) => {
-                  return item.value == this.module
+                  return item[`${selectConfig.value}`] == this.module
                 })
-                return list[index].label
+
+                return list[index][`${selectConfig.label}`]
               } else {
                 return '暂无数据'
               }
@@ -339,10 +341,12 @@ export default {
               let text = ''
               this.module.forEach((item) => {
                 let index = list.findIndex((citem) => {
-                  return citem.value == item
+                  return citem[`${selectConfig.value}`] == item
                 })
 
-                text += text ? ` / ${list[index].label}` : list[index].label
+                text += text
+                  ? ` / ${list[index][`${selectConfig.label}`]}`
+                  : list[index][`${selectConfig.label}`]
               })
               return text
             }
@@ -583,6 +587,15 @@ export default {
 .disabled {
   cursor: not-allowed !important;
 
+  .item-content {
+    /deep/ textarea {
+      border: 0px !important;
+      &:hover {
+        border-color: transparent !important ;
+      }
+    }
+  }
+
   .content-value {
     color: var(--font-color-ds) !important;
   }

package/packages/components/proPageTable/oa_pro-table-search.vue

@@ -7,6 +7,10 @@
       @handleSearch="handleSearch"
       @handleScreen="handleScreen"
     >
+      <template slot="search-hearch-extend">
+        <slot name="table-search-extend"></slot>
+      </template>
+
       <el-button
         size="small"
         :class="{
@@ -15,11 +19,13 @@
         :disabled="_proScreenList.length <= 0 && !proScreenCardShow"
         @click="handleProScreenList(false)"
         :type="proScreenCardShow ? 'selected' : 'info'"
-        >{{ handleScreenText }} <i :class="handleScreenIcon"></i>
+      >
+        {{ handleScreenText }}
+        <i :class="handleScreenIcon"></i>
       </el-button>
       <el-button size="small" @click="handleOpenProScreen">
-        <i class="meixicomponenticonfont meixicomponenticon-shaixuan"></i
-        >高级筛选
+        <i class="meixicomponenticonfont meixicomponenticon-shaixuan"></i>
+        高级筛选
       </el-button>
     </searchHeaderVue>
 
@@ -32,7 +38,7 @@
             :event="false"
             :icon="false"
             :useSlot="true"
-            style="width: auto"
+            style="width: auto;"
             :valueAlign="`left`"
             :label="`排列方式：`"
           >
@@ -65,9 +71,9 @@
 </template>
 
 <script>
-import oa_pro_screen_itemVue from "./oa_pro_screen_item.vue";
-import searchHeaderVue from "../searchHeader/searchHeader.vue";
-import baseButtonHandle from "../base/baseButtonHandle/baseButtonHandle.vue";
+import oa_pro_screen_itemVue from './oa_pro_screen_item.vue'
+import searchHeaderVue from '../searchHeader/searchHeader.vue'
+import baseButtonHandle from '../base/baseButtonHandle/baseButtonHandle.vue'
 export default {
   data() {
     return {
@@ -78,14 +84,14 @@ export default {
       toggle: {
         index: 1,
         list: [
-          { label: "三列", value: 1 },
-          { label: "四列", value: 2 },
+          { label: '三列', value: 1 },
+          { label: '四列', value: 2 },
         ],
       },
-    };
+    }
   },
   created() {
-    this.initFooterHandleList();
+    this.initFooterHandleList()
   },
   props: {
     value: {},
@@ -107,97 +113,97 @@ export default {
   },
   computed: {
     proScreenCardShow() {
-      return this._proScreenList.length > 0 && this.showProScreenList;
+      return this._proScreenList.length > 0 && this.showProScreenList
     },
     handleScreenIcon() {
-      return this.proScreenCardShow ? "el-icon-arrow-up" : "el-icon-arrow-down";
+      return this.proScreenCardShow ? 'el-icon-arrow-up' : 'el-icon-arrow-down'
     },
     handleScreenText() {
-      return this.proScreenCardShow ? "收起筛选" : "展开筛选";
+      return this.proScreenCardShow ? '收起筛选' : '展开筛选'
     },
 
     _proScreenList() {
       return this.$props.proScreenList.filter((item) => {
-        return item.exposed;
-      });
+        return item.exposed
+      })
     },
     rowWidth() {
-      return this.toggle.index == 1 ? 33 : 25;
+      return this.toggle.index == 1 ? 33 : 25
     },
 
     screenStyle() {
       return {
         width: `${this.rowWidth}%`,
-      };
+      }
     },
 
     module: {
       get() {
-        return this.$props.value;
+        return this.$props.value
       },
       set(val) {
-        this.$emit("input", val);
+        this.$emit('input', val)
       },
     },
   },
   methods: {
     handleSearch() {
-      this.$parent.refreshData();
+      this.$parent.refreshData()
     },
     handleProScreenList(flag = false) {
       if (!flag) {
-        this.showProScreenList = !this.showProScreenList;
+        this.showProScreenList = !this.showProScreenList
       } else {
-        this.showProScreenList = true;
+        this.showProScreenList = true
       }
 
-      this.computedHeight();
+      this.computedHeight()
     },
     handleScreen(index) {
-      this.$parent.handleScreen(index);
+      this.$parent.handleScreen(index)
     },
     computedHeight() {
       this.$nextTick(() => {
         this.$emit(
-          "searchContentHeightChange",
-          this.$refs.oaProTableSearchContent.clientHeight
-        );
-      });
+          'searchContentHeightChange',
+          this.$refs.oaProTableSearchContent.clientHeight,
+        )
+      })
     },
     handleOpenProScreen() {
-      this.$parent.handleOpenProScreen();
+      this.$parent.handleOpenProScreen()
     },
 
     // 尾部按钮
     initFooterHandleList() {
       this.footerHandleConfig = [
         {
-          text: "确定",
-          type: "primary",
+          text: '确定',
+          type: 'primary',
           plain: false,
           click: () => {
-            this.$parent.refreshData();
+            this.$parent.refreshData()
           },
         },
         {
-          text: "清空条件",
-          type: "info",
+          text: '清空条件',
+          type: 'info',
           plain: true,
           click: () => {
-            this.$parent.cleanProscreenCondition(true);
+            this.$parent.cleanProscreenCondition(true)
           },
         },
-      ];
+      ]
     },
   },
   watch: {
     proScreenCardShow(newVal, oldVal) {
       if (!newVal) {
-        this.showProScreenList = false;
+        this.showProScreenList = false
       }
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>

package/packages/components/proPageTable/oa_pro_table.vue

@@ -29,7 +29,11 @@
         :proScreenList="proScreenList"
         :proScreenConfig="_proScreenConfig"
         @searchContentHeightChange="searchContentHeightChange"
-      ></oa_pro_table_searchVue>
+      >
+        <template slot="table-search-extend">
+          <slot name="search-extend"></slot>
+        </template>
+      </oa_pro_table_searchVue>
     </div>
 
     <!-- 表格内容 -->

package/packages/components/searchHeader/searchHeader.vue

@@ -5,15 +5,15 @@
         v-if="input"
         size="small"
         v-model="module"
-        style="width: 220px"
+        style="width: 220px;"
         :placeholder="placeholder"
         suffix-icon="el-icon-search"
         @keyup.enter.native="handleSearch"
-      >
-      </el-input>
+      ></el-input>
 
       <div class="header-config-wrap" v-if="searchList">
         <span class="view-text">显示：</span>
+
         <el-button
           :key="index"
           :size="size"
@@ -23,8 +23,11 @@
           @click="handleScreen(index)"
           v-for="(item, index) in searchList.list"
           :type="index == searchList.index ? 'selected' : 'info'"
-          >{{ item.label }}</el-button
         >
+          {{ item.label }}
+        </el-button>
+
+        <slot name="search-hearch-extend"></slot>
       </div>
     </div>
     <div class="search-header-wrap-right">
@@ -36,7 +39,7 @@
 <script>
 export default {
   data() {
-    return {};
+    return {}
   },
   props: {
     value: {},
@@ -49,29 +52,29 @@ export default {
     },
     size: {
       type: String,
-      default: "small",
+      default: 'small',
     },
     placeholder: { type: String },
   },
   computed: {
     module: {
       get() {
-        return this.$props.value;
+        return this.$props.value
       },
       set(val) {
-        this.$emit("input", val);
+        this.$emit('input', val)
       },
     },
   },
   methods: {
     handleSearch() {
-      this.$emit("handleSearch");
+      this.$emit('handleSearch')
     },
     handleScreen(index) {
-      this.$emit("handleScreen", index);
+      this.$emit('handleScreen', index)
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>

package/src/component/test.vue

@@ -311,7 +311,7 @@ export default {
 }
 </style> -->
 
-<template>
+<!-- <template>
   <div class="page-table-wrap" ref="pageTableWrap" v-if="show">
     <base-pro-table
       :align="`left`"
@@ -327,7 +327,6 @@ export default {
       :totalPropsList="totalPropsList"
       :proScreenConfig="proScreenConfig"
     >
-      <!-- 表格头部插槽 -->
       <template>
         <base-icon
           :color="`m`"
@@ -359,16 +358,15 @@ export default {
         </el-dropdown>
       </template>
 
-      <!-- 自定义模板列 -->
       <template v-slot:gmtCreate="data">
         <el-button type="text" :disabled="false">222</el-button>
       </template>
       <template v-slot:address="data">template-{{ data.scope }}</template>
     </base-pro-table>
   </div>
-</template>
+</template> -->
 
-<script>
+<!-- <script>
 import tableTable from '../test'
 import companyInfoConfig from '../config/CompanyInfoConfig'
 import componentConfig from '../../packages/config/componentConfig'
@@ -557,7 +555,7 @@ export default {
   height: 100%;
   background: inherit;
 }
-</style>
+</style> -->
 
 <!-- 普通表单 -->
 
@@ -817,3 +815,52 @@ export default {
 </script>
 
 <style></style> -->
+
+<template>
+  <base-form-wrap
+    :rowNumber="2"
+    :disabled="true"
+    :labelWidth="`155px`"
+    ref="businessBaseForm"
+    :formTitle="`dsada`"
+    :formList="formList"
+  ></base-form-wrap>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      formList: [
+        {
+          value: '',
+          key: 'legalPerson',
+          type: 'input',
+          label: '法人名称',
+        },
+        {
+          value: '',
+          key: 'idCard',
+          type: 'input',
+          label: '法人身份证',
+        },
+        {
+          value: '',
+          key: 'businessLicense',
+          type: 'select',
+          label: '营业执照号',
+          useStore: 'testSelectStore',
+        },
+        {
+          value: 'sdakjsdkajk',
+          key: 'businessLicenseFile',
+          type: 'textarea',
+          label: '营业执照电子版',
+        },
+      ],
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped></style>

package/src/component/testSelectStore.js

@@ -1,4 +1,4 @@
-import meixioacomponent from "../../packages/components/index";
+import meixioacomponent from '../../packages/components/index'
 // 示例
 let testRequest = () => {
   return new Promise((resolve, reject) => {
@@ -6,38 +6,26 @@ let testRequest = () => {
       resolve([
         {
           value: 1,
-          label: "黄金糕",
+          label: '黄金糕',
         },
         {
           value: 2,
-          label: "双皮奶",
+          label: '双皮奶',
         },
-        {
-          value: 3,
-          label: "蚵仔煎",
-        },
-        {
-          value: 4,
-          label: "龙须面",
-        },
-        {
-          value: 5,
-          label: "北京烤鸭",
-        },
-      ]);
-    }, 5000);
-  });
-};
+      ])
+    }, 100)
+  })
+}
 
 class TestSelectStore extends meixioacomponent.SelectStore {
   constructor(params) {
-    super(params);
+    super(params)
   }
 }
 
 let testSelectStore = new TestSelectStore({
-  name: "testSelectStore",
+  name: 'testSelectStore',
   request: testRequest,
-});
+})
 
-export default testSelectStore;
+export default testSelectStore