meixioacomponent 0.3.67 → 0.3.70

package/package.json

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

package/packages/components/base/basePageHeader/basePageHeader.vue

@@ -4,15 +4,15 @@
       <span class="header-text">{{ headerText }}</span>
       <slot name="prefix"></slot>
     </div>
-    <slot class="header-wrap-right" name="header-wrap-right"> </slot>
+    <slot class="header-wrap-right" name="header-wrap-right"></slot>
   </div>
 </template>
 
 <script>
 export default {
-  name: "basePageHeader",
+  name: 'basePageHeader',
   data() {
-    return {};
+    return {}
   },
   props: {
     headerText: {
@@ -20,7 +20,7 @@ export default {
       require: true,
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -28,6 +28,7 @@ export default {
   width: 100%;
   height: auto;
   display: flex;
+  user-select: none;
   align-items: center;
   flex-flow: row nowrap;
   justify-content: space-between;

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

@@ -69,17 +69,16 @@
           </template>
         </el-form-item>
       </div>
-
-      <baseButtonHandleVue
-        v-if="footer"
-        :align="`end`"
-        :size="`mini`"
-        class="form-footer"
-        :config="handleConfig"
-      ></baseButtonHandleVue>
     </el-form>
-
-    <div class="form-skeleton-wrap" v-else>
+    <baseButtonHandleVue
+      v-if="footer"
+      :align="`end`"
+      :size="`mini`"
+      class="form-footer"
+      :config="handleConfig"
+    ></baseButtonHandleVue>
+
+    <div class="form-skeleton-wrap" v-if="loading">
       <div
         class="form-skeleton-item-wrap"
         :key="item.key"
@@ -173,6 +172,8 @@ export default {
       type: String,
       default: 'small',
     },
+
+    footButtonText: { type: Array, default: () => ['取消', '确定'] },
   },
   components: {
     baseAreaVue,
@@ -221,9 +222,11 @@ export default {
   methods: {
     init() {
       if (this.$props.form) {
+        const { footButtonText } = this.$props
+
         this.handleConfig = [
           {
-            text: '取消',
+            text: `${footButtonText[0]}`,
             type: 'info',
             plain: true,
             click: () => {
@@ -231,7 +234,7 @@ export default {
             },
           },
           {
-            text: '确定',
+            text: `${footButtonText[1]}`,
             type: 'primary',
             plain: false,
             click: () => {
@@ -367,7 +370,25 @@ export default {
     },
 
     disableWatcherResult(params) {
-      this.$emit('disableWatcherResult', params)
+      const isBaseDialogForm = this.$parent.$options.name == 'baseDialogForm'
+      if (isBaseDialogForm) {
+        this.$emit('disableWatcherResult', params)
+      } else {
+        const { result, type, key } = params
+
+        const index = this.module.findIndex((item) => {
+          return item.key == key
+        })
+
+        if (index > -1) {
+          const formItem = this.module[index]
+          if (type == 'hide') {
+            this.$set(formItem, 'renderHide', result)
+          } else if (type == 'disable') {
+            this.$set(formItem, 'disabled', result)
+          }
+        }
+      }
     },
 
     setFormItemWidth() {
@@ -445,6 +466,7 @@ export default {
     align-items: flex-start;
   }
   .form-footer {
+    padding: var(--padding-5);
     margin-top: var(--margin-5);
   }
 

package/src/component/test.vue

@@ -819,7 +819,7 @@ export default {
 <template>
   <base-form-wrap
     :rowNumber="2"
-    :disabled="true"
+    :disables="disables"
     :labelWidth="`155px`"
     ref="businessBaseForm"
     :formTitle="`dsada`"
@@ -845,7 +845,7 @@ export default {
           label: '法人身份证',
         },
         {
-          value: '',
+          value: 1,
           key: 'businessLicense',
           type: 'select',
           label: '营业执照号',
@@ -858,6 +858,19 @@ export default {
           label: '营业执照电子版',
         },
       ],
+      disables: {
+        businessLicense: {
+          effects: [
+            {
+              key: 'businessLicenseFile',
+              type: 'hide',
+              fn: (val) => {
+                return val == 2
+              },
+            },
+          ],
+        },
+      },
     }
   },
 }