meixioacomponent 0.3.39 → 0.3.40

package/package.json

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

package/packages/components/proForm/proForm/pro_form.vue

@@ -38,25 +38,27 @@
               @formItemConfirm="formItemConfirm"
               @disableWatcherResult="disableWatcherResult"
               :disableWatcher="setWatcher(item.key)"
-              v-if="formType == 'default' && item.type != 'area'"
+              v-if="formType == 'default'"
             >
               <template slot="template" v-if="item.type == 'template'">
                 <slot :name="`form-${item.key}`" :scope="module"></slot>
               </template>
+              <template slot="area" v-if="item.type == 'area'">
+                <baseAreaVue
+                  v-model="item.value"
+                  :disable="item.disabled"
+                  :ref="`area-${item.key}`"
+                  :style="{ width: `100%` }"
+                  :class="[`form-item-${item.key}`]"
+                  @confirmAreaValue="
+                    formItemConfirm({
+                      config: item,
+                    })
+                  "
+                ></baseAreaVue>
+              </template>
             </pro_form_itemVue>
-            <baseAreaVue
-              v-model="item.value"
-              :disable="item.disabled"
-              v-if="item.type == 'area'"
-              :ref="`area-${item.key}`"
-              :style="{ width: `100%` }"
-              :class="[`form-item-${item.key}`]"
-              @confirmAreaValue="
-                formItemConfirm({
-                  config: item,
-                })
-              "
-            ></baseAreaVue>
+
             <baseUploadVue
               v-model="item.value"
               :max="formConfig.max"

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

@@ -8,7 +8,7 @@
       'form-item-wrap': true,
     }"
   >
-    <div class="item-content" v-if="config.type != 'template' && !isEdit">
+    <div class="item-content" v-if="!typeOftemplate && !isEdit">
       <p
         v-if="!spContentType"
         class="content-value"
@@ -189,6 +189,7 @@
       ></el-input>
       <!-- 插槽 -->
       <slot name="template" v-else-if="config.type == 'template'"></slot>
+      <slot name="area" v-else-if="config.type == 'area'"></slot>
     </div>
     <!-- 确定的按钮 -->
     <div class="bottom-handle-wrap" v-show="isEdit && !form">
@@ -213,7 +214,6 @@
 </template>
 
 <script>
-import { FilterTime } from '../../../utils/utils'
 //
 import componentConfig from '../../../config/componentConfig'
 export default {
@@ -303,6 +303,17 @@ export default {
       }
       return false
     },
+
+    typeOftemplate() {
+      const { type } = this.$props.config
+
+      if (type == 'template' || type == 'area') {
+        return true
+      }
+
+      return false
+    },
+
     contentValue() {
       let type = this.$props.config.type
       switch (type) {
@@ -425,7 +436,6 @@ export default {
     },
     targetFocus() {
       let ref = this.$refs.target
-      console.log(ref)
       if (ref) {
         ref.focus()
       }