meixioacomponent 0.2.9 → 0.2.12

package/package.json

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

package/packages/components/base/baseArea/baseArea.vue

@@ -22,7 +22,7 @@
                 :event="true"
                 @iconClick="backArea"
                 v-show="activeIndex > 1"
-                :name="`icon-icon-arrow-left`"
+                :name="`meixicomponenticon-icon-arrow-left`"
               ></base-icon>
             </div>
           </div>
@@ -92,6 +92,7 @@
 </template>
 
 <script>
+import { json } from "body-parser";
 import baseButtonHandleVue from "../baseButtonHandle/baseButtonHandle.vue";
 //
 import areaJson from "./area";
@@ -116,23 +117,6 @@ export default {
   },
   created() {
     this.init();
-    this.handleConfig = [
-      {
-        type: "info",
-        text: this.module ? "取消" : "清空",
-        plain: false,
-        click: () => {
-          this.cancelValue();
-        },
-      },
-      {
-        type: "primary",
-        text: "确定",
-        click: () => {
-          this.confirmValue();
-        },
-      },
-    ];
   },
 
   props: {
@@ -151,13 +135,14 @@ export default {
   computed: {
     module: {
       set(val) {
-        //console.log(val);
+        console.log(val);
         this.$emit("input", val);
       },
       get() {
         return this.$props.value;
       },
     },
+
     suffixIcon() {
       if (this.isOpen) {
         return "el-icon-arrow-up";
@@ -223,8 +208,34 @@ export default {
       if (!this.isReview) {
         this.review();
       }
+      this.setHandleConfig();
       this.scrollToProvince();
     },
+    setHandleConfig() {
+      console.log(this.$props.value);
+      this.handleConfig = [
+        {
+          type: "info",
+          text: this.module ? "清空" : "取消",
+          plain: false,
+          click: () => {
+            if (!this.module) {
+              this.cancelValue();
+            } else {
+              this.cancelValue();
+              this.module = null;
+            }
+          },
+        },
+        {
+          type: "primary",
+          text: "确定",
+          click: () => {
+            this.confirmValue();
+          },
+        },
+      ];
+    },
 
     review() {
       // let provice = areaJson.findIndex((item) => {});
@@ -321,31 +332,29 @@ export default {
         this.areaValue = [];
       } else {
         this.init();
+        // this.module = null;
         this.isReview = false;
       }
-      this.$refs.popover.doClose();
+      this.doClose();
     },
 
     confirmValue() {
       let value = {};
       for (let i = 0; i < this.areaValue.length; i++) {
         value[`${areaConfig[i].value}`] = this.areaValue[i].label;
-        // if (this.module instanceof Object) {
-        //   this.module[`${areaConfig[i].value}`] = this.areaValue[i].label;
-        // } else if (this.$props.value != null && !this.module) {
-        //   this.$emit("changeValue", {});
-        //   //console.log(this.value);
-        //   this.module[`${areaConfig[i].value}`] = this.areaValue[i].label;
-        //   // let obj = {};
-        //   // obj[`${areaConfig[i].value}`] = this.areaValue[i].label;
-        //   // this.module = obj;
-        // }
       }
+      if (JSON.stringify(value) !== "{}") {
+        this.module = value;
+      }
+      if (this.$parent.$options._componentTag == "el-form-item") {
+        this.$emit("confirmAreaValue");
+      } else {
+        this.$emit("confirmAreaValue", value);
+        this.doClose();
+      }
+    },
 
-      this.module = value;
-
-      this.$emit("confirmAreaValue", value);
-      //console.log(this.module);
+    doClose() {
       this.$refs.popover.doClose();
     },
 

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

@@ -36,9 +36,14 @@
           <baseAreaVue
             :disable="citem.disabled"
             v-if="citem.type == 'area'"
+            :ref="`area-${citem.key}`"
             v-model="formdata[`${citem.key}`]"
             :class="[`form-item-${citem.key}`]"
-            @confirmAreaValue="formItemConfirm(citem)"
+            @confirmAreaValue="
+              formItemConfirm({
+                config: citem,
+              })
+            "
           ></baseAreaVue>
           <baseUploadVue
             :max="formConfig.max"
@@ -190,26 +195,46 @@ export default {
     },
 
     formItemConfirm(params) {
+      if (params.config.type == "area") {
+        this.formAreaConfirm(params);
+        return;
+      }
+      let result = this.submitVerifiData(params);
+      console.log(result);
+      if (result) {
+        params.this.handleConfirm();
+        this.$emit("formItemConfirm", params.config);
+      }
+    },
+    formAreaConfirm(params) {
+      let result = this.submitVerifiData(params);
+      if (result) {
+        this.$refs[`area-${params.config.key}`][0].doClose();
+        this.$emit("formItemConfirm", params.config);
+      } else {
+        this.$message.error("请重新选择");
+      }
+    },
+    submitVerifiData(params) {
       if (this.$props.rules) {
         // element 验证单条表单修改
+        let confrim = true;
         const rulesItem = this.$props.rules[params.config.key];
         if (rulesItem) {
           this.$refs.form.validateField(
             [`${params.config.key}`],
             (errorMsg) => {
-              //console.log(errorMsg);
-              if (!errorMsg) {
-                params.this.handleConfirm();
-                this.$emit("formItemConfirm", params.config);
-                return;
+              console.log(errorMsg);
+              if (errorMsg) {
+                confrim = false;
               }
             }
           );
         }
-        return;
+        return confrim;
+      } else {
+        return true;
       }
-      params.this.handleConfirm();
-      this.$emit("formItemConfirm", params.config);
     },
     setFormData() {
       this.formdata = {};
@@ -331,6 +356,11 @@ export default {
     /deep/ .el-form-item__label {
       line-height: 24px !important;
     }
+
+    /deep/ .el-form-item__error {
+      line-height: 0px;
+      padding-top: 0px;
+    }
   }
 }
 </style>

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

@@ -488,7 +488,6 @@ export default {
 
   .item-content {
     min-height: 24px;
-    max-height: 24px;
     /deep/ .base-icon-wrap {
       width: 20px !important;
       height: 20px !important;