meixioacomponent 0.3.64 → 0.3.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.3.64",
+  "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

@@ -8,7 +8,7 @@
       @handleScreen="handleScreen"
     >
       <template slot="search-hearch-extend">
-        <slot slot="table-search-extend"></slot>
+        <slot name="table-search-extend"></slot>
       </template>
 
       <el-button

package/packages/components/proPageTable/oa_pro_table.vue

@@ -31,7 +31,7 @@
         @searchContentHeightChange="searchContentHeightChange"
       >
         <template slot="table-search-extend">
-          <slot slot="search-extend"></slot>
+          <slot name="search-extend"></slot>
         </template>
       </oa_pro_table_searchVue>
     </div>

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