meixioacomponent 0.4.39 → 0.4.40

package/package.json

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

package/packages/components/base/baseStoreSelect/index.vue

@@ -0,0 +1,99 @@
+<template>
+  <el-select
+    :size="size"
+    ref="target"
+    v-if="selectStore"
+    v-model="module"
+    :filterable="true"
+    placeholder="请选择"
+    :disabled="disabled"
+    :multiple="multiple"
+    :loading="selectLoading"
+    :multipleLimit="multipleLimit"
+    @visible-change="visibleChange"
+    style="width: 100%; height: 100%;"
+  >
+    <el-option
+      v-for="item in selectData"
+      :key="item.value"
+      :label="item[`${selectConfig.label}`]"
+      :value="item[`${selectConfig.value}`]"
+    ></el-option>
+  </el-select>
+</template>
+
+<script>
+import componentConfig from '../../../config/componentConfig'
+export default {
+  name: 'baseStoreSelect',
+  data() {
+    return {}
+  },
+  created() {
+    this.loadSelectData()
+  },
+  props: {
+    size: {},
+    value: {},
+    multiple: {},
+    disabled: {},
+    multipleLimit: {},
+    useStore: {},
+    useSlot: {
+      default: false,
+    },
+  },
+
+  computed: {
+    module: {
+      set(val) {
+        this.$emit('input', val)
+      },
+      get() {
+        return this.$props.value
+      },
+    },
+    selectLoading() {
+      return this.selectStore?.getLoading()
+    },
+    selectStore() {
+      const { useStore } = this.$props
+      return componentConfig.selectStore.getStore(useStore)
+    },
+    selectData() {
+      return this.selectStore.getData()
+    },
+    selectConfig() {
+      return this.selectStore.getConfig()
+    },
+  },
+
+  methods: {
+    visibleChange() {},
+
+    focus() {
+      this.$refs.target.focus()
+    },
+
+    getSelectData() {
+      return this.selectData
+    },
+
+    getSelectConfig() {
+      return this.selectConfig
+    },
+
+    loadSelectData() {
+      this.selectStore.loadData()
+    },
+
+    visibleChange(visible) {
+      if (!visible) return
+      if (this.selectData.length > 0) return
+      this.loadSelectData()
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped></style>

package/packages/components/base/baseUpload/baseUpload.vue

@@ -90,6 +90,7 @@ export default {
   methods: {
     handleDeleteUploadItem(index) {
       this.module.splice(index, 1)
+      this.$emit('onDelUploadItem', index)
     },
   },
 }

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

@@ -8,9 +8,9 @@
       'form-item-wrap': true,
     }"
   >
-    <div class="item-content" v-if="!typeOftemplate && !isEdit">
+    <div class="item-content" v-if="!typeOftemplate" v-show="!isEdit">
       <p
-        v-if="!spContentType"
+        v-if="!spContentType && selectMounted"
         class="content-value"
         @click="handleClick('content')"
         :class="[`${config.click ? 'click' : config.color}`]"
@@ -71,7 +71,7 @@
       ></base-icon>
     </div>
 
-    <div class="item-handle-wrap" :class="[`${config.type}`]" v-else>
+    <div class="item-handle-wrap" :class="[`${config.type}`]" v-show="isEdit">
       <!-- input输入框 -->
       <el-input
         ref="target"
@@ -107,28 +107,19 @@
       ></BaseNumberInput>
 
       <!-- select选择器 -->
-      <el-select
+
+      <baseStoreSelect
         :size="size"
         ref="target"
         v-model="module"
-        placeholder="请选择"
         :multiple="multiple"
-        :filterable="true"
-        :loading="selectLoading"
         :disabled="isDisabled"
-        @visible-change="visibleChange"
-        style="width: 100%; height: 100%;"
-        v-else-if="config.type == 'select' && selectStore"
+        :useStore="config.useStore"
+        v-else-if="config.type == 'select'"
+        @hook:mounted="selectMounted = true"
         :multipleLimit="config.multipleLimit"
-      >
-        <el-option
-          v-for="item in selectData"
-          :key="item.value"
-          :label="item[`${selectConfig.label}`]"
-          :value="item[`${selectConfig.value}`]"
-        ></el-option>
-      </el-select>
-      <!-- 单时间选择器 -->
+      ></baseStoreSelect>
+
       <el-date-picker
         align="right"
         v-model="module"
@@ -221,14 +212,14 @@
 </template>
 
 <script>
-//
-import componentConfig from '../../../config/componentConfig'
 import BaseNumberInput from '../../base/baseNumberInput/index.vue'
+import baseStoreSelect from '../../base/baseStoreSelect/index.vue'
 export default {
   data() {
     return {
       isEdit: false,
       oldValue: null,
+      selectMounted: false,
     }
   },
   created() {
@@ -279,18 +270,7 @@ export default {
     multiple() {
       return this.$props.config.multipleLimit ? true : false
     },
-    selectLoading() {
-      return this.selectStore?.getLoading()
-    },
-    selectStore() {
-      return componentConfig.selectStore.getStore(this.$props.config.useStore)
-    },
-    selectData() {
-      return this.selectStore.getData()
-    },
-    selectConfig() {
-      return this.selectStore.getConfig()
-    },
+
     spContentType() {
       let configType = this.$props.config.type
       if (
@@ -317,8 +297,8 @@ export default {
         case 'textarea':
           return this.module
         case 'select':
-          let list = this.selectData
-          const selectConfig = this.selectConfig
+          let list = this.$refs.target.getSelectData()
+          const selectConfig = this.$refs.target.getSelectConfig()
           if (list.length > 0) {
             if (!this.multiple) {
               if (this.module) {
@@ -342,7 +322,7 @@ export default {
               return text
             }
           } else {
-            this.loadSelectData()
+            this.$refs.target.loadSelectData()
             return this.$props.config.value
           }
         // case "time":
@@ -384,12 +364,6 @@ export default {
     },
     module: {
       get() {
-        let type = this.$props.config.type
-        if (type == 'select') {
-          if (this.selectData.length <= 0) {
-            this.loadSelectData()
-          }
-        }
         return this.$props.value
       },
       set(val) {
@@ -449,14 +423,7 @@ export default {
     handleConfirm() {
       this.isEdit = false
     },
-    loadSelectData() {
-      this.selectStore.loadData()
-    },
-    visibleChange(visible) {
-      if (!visible) return
-      if (this.selectData.length > 0) return
-      this.loadSelectData()
-    },
+
     triggerDisable(val) {
       let effects = this.$props.disableWatcher.effects
       effects.forEach((item) => {
@@ -475,7 +442,7 @@ export default {
       this.init()
     },
   },
-  components: { BaseNumberInput },
+  components: { BaseNumberInput, baseStoreSelect },
 }
 </script>
 

package/src/component/test.vue

@@ -544,7 +544,7 @@ export default {
 <!-- 普通表单 -->
 
 <!-- 上传表单 -->
-<template>
+<!-- <template>
   <base-dialog-form
     ref="dialogFormVue"
     :title="`测试表格`"
@@ -559,9 +559,6 @@ export default {
       <el-input v-model="data.scope[0].value"></el-input>
     </template>
 
-    <!-- <template slot="formWrap-test2">
-      <div style="width: 100%; height: 100px; background: red;"></div>
-    </template> -->
   </base-dialog-form>
 </template>
 
@@ -813,9 +810,9 @@ export default {
 }
 </script>
 
-<style></style>
+<style></style> -->
 
-<!-- <template>
+<template>
   <base-form-wrap
     :rowNumber="2"
     :disables="disables"
@@ -831,18 +828,6 @@ export default {
   data() {
     return {
       formList: [
-        {
-          value: '',
-          key: 'legalPerson',
-          type: 'input',
-          label: '法人名称',
-        },
-        {
-          value: '',
-          key: 'idCard',
-          type: 'input',
-          label: '法人身份证',
-        },
         {
           value: 1,
           key: 'businessLicense',
@@ -850,12 +835,6 @@ export default {
           label: '营业执照号',
           useStore: 'testSelectStore',
         },
-        {
-          value: 'sdakjsdkajk',
-          key: 'businessLicenseFile',
-          type: 'textarea',
-          label: '营业执照电子版',
-        },
       ],
       disables: {
         businessLicense: {
@@ -875,4 +854,4 @@ export default {
 }
 </script>
 
-<style lang="less" scoped></style> -->
+<style lang="less" scoped></style>

package/src/component/testSelectStore.js

@@ -13,7 +13,7 @@ let testRequest = () => {
           label: '双皮奶',
         },
       ])
-    }, 100)
+    }, 5000)
   })
 }