meixioacomponent 0.4.39 → 0.4.42

package/package.json

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

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

@@ -1,19 +1,19 @@
 <template>
   <div class="pro-number-wrap">
     <el-input-number
-      :size="size"
-      ref="target"
-      :controls="false"
       :class="{
         unit: unit,
       }"
+      :size="size"
+      ref="target"
+      :controls="controls"
       :precision="precision"
       v-model.number="module"
       :disabled="disabled"
       :maxlength="maxlength"
       style="width: 100%; height: 100%;"
     ></el-input-number>
-    <div class="number-unit" v-if="unit">
+    <div class="number-unit" v-if="unit && !controls">
       <span>{{ unit }}</span>
     </div>
   </div>
@@ -39,6 +39,8 @@ export default {
     maxlength: {},
 
     size: {},
+
+    controls: { default: false },
   },
   computed: {
     module: {

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/dialogForm/baseDialogForm.vue

@@ -169,7 +169,7 @@ export default {
   },
   methods: {
     createSlots() {
-      this.slotList=[];
+      this.slotList = []
       for (let i = 0; i < this.module.length; i++) {
         let item = this.module[i]
         for (let j = 0; j < item.formList.length; j++) {
@@ -181,33 +181,36 @@ export default {
       }
     },
     disableWatcherResult(params) {
-      const { result, type, key } = params
-      let index = 0
-      let cindex = -1
+      console.log(params)
+      this.$nextTick(() => {
+        const { result, type, key } = params
+        let index = 0
+        let cindex = -1
 
-      for (let i = 0; i < this.module.length; i++) {
-        let item = this.module[i]
-        for (let j = 0; j < item.formList.length; j++) {
-          let citem = item.formList[j]
-          if (citem.key == key) {
-            index = i
-            cindex = j
-            break
+        for (let i = 0; i < this.module.length; i++) {
+          let item = this.module[i]
+          for (let j = 0; j < item.formList.length; j++) {
+            let citem = item.formList[j]
+            if (citem.key == key) {
+              index = i
+              cindex = j
+              break
+            }
           }
         }
-      }
 
-      if (cindex > -1) {
-        let formItem = this.module[index].formList[cindex]
-        if (type == 'hide') {
-          this.$set(formItem, 'renderHide', result)
-        } else if (type == 'disable') {
-          this.$set(formItem, 'disabled', result)
-        } else if (type == 'template') {
-          formItem.type = result
-          this.createSlots()
+        if (cindex > -1) {
+          let formItem = this.module[index].formList[cindex]
+          if (type == 'hide') {
+            this.$set(formItem, 'renderHide', result)
+          } else if (type == 'disable') {
+            this.$set(formItem, 'disabled', result)
+          } else if (type == 'template') {
+            formItem.type = result
+            this.createSlots()
+          }
         }
-      }
+      })
     },
     setLabelPosition(type) {
       if (!type) {

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) => {
@@ -465,8 +432,11 @@ export default {
           type: item.type,
           result: item.fn(val),
         }
-        console.log(val)
+     
+        
         this.$emit('disableWatcherResult', obj)
+
+
       })
     },
   },
@@ -475,7 +445,7 @@ export default {
       this.init()
     },
   },
-  components: { BaseNumberInput },
+  components: { BaseNumberInput, baseStoreSelect },
 }
 </script>