meixioacomponent 2.0.40 → 2.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "2.0.40",
+  "version": "2.0.41",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -20,43 +20,29 @@
 
 <script>
 import baseButtonHandleVue from '../baseButtonHandle/baseButtonHandle.vue'
-import {GetAreaTree} from "./api";
 import areaConfig from "./areaConfig";
 import {TransomComponentSize} from "../../../utils/utils";
+import {mixinsByBaseArea} from "../../mixins/mixinsByBaseArea";
 //
 
 export default {
   name: 'baseArea',
   data() {
     return {
-      loading: false,
       localValue: [],
       localDetailValue: {},
-      placeholder: '请选择省市区镇',
-      options: [],
       inputProps: {
         value: '',
       },
     }
   },
+  mixins: [mixinsByBaseArea],
   created() {
   },
-
-  mounted() {
-    this.loadArea('').then(res => {
-      this.options = res;
-    })
-  },
-
   props: {
     value: {
       default: null,
     },
-    disable: {
-      type: Boolean,
-      default: false,
-    },
-    size: {type: String, default: 'small'}
   },
 
   components: {
@@ -95,33 +81,6 @@ export default {
         }
       }
     },
-    load(node) {
-      const {value, data} = node;
-      return new Promise((resolve) => {
-        this.loadArea(data ? data.code : '').then(res => {
-          resolve(res);
-        })
-      })
-    },
-
-    loadArea(keyword) {
-      return new Promise((resolve) => {
-        this.loading = true;
-        GetAreaTree({
-          keyword: keyword
-        }).then(res => {
-          if (Array.isArray(res)) {
-            res.forEach(item => {
-              item[`children`] = item.level !== 4;
-            })
-            this.loading = false;
-            resolve(res);
-          } else {
-            resolve([]);
-          }
-        })
-      })
-    },
     onChange() {
       this.inputProps.value = '';
       this.$nextTick(() => {

package/packages/components/base/baseAreaByMultiple/baseAreaByMultiple.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="base_area_by_multiple-wrap">
+    <t-cascader
+        ref="cascader"
+        v-model="value"
+        :options="options"
+        @change="onChange"
+        :load="load"
+        :keys="{
+          value:'value',
+          label:'name',
+          children: 'children',
+        }"
+        :disabled="disable||loading"
+        :placeholder="placeholder"
+        value-mode="all"
+        value-type="full"
+        multiple
+        clearable/>
+  </div>
+</template>
+
+<script>
+/**
+ * 该组件不支持回显
+ */
+import {defineComponent} from 'vue'
+import {mixinsByBaseArea} from "../../mixins/mixinsByBaseArea";
+import areaConfig from "../baseArea/areaConfig";
+
+export default defineComponent({
+  name: "baseAreaByMultiple",
+  data() {
+    return {
+      options: [],
+      value: []
+    }
+  },
+  mixins: [mixinsByBaseArea],
+  methods: {
+    onChange() {
+    },
+    getCheckValue() {
+      const valueList = this.value;
+      const value = [];
+      for (let i = 0; i < valueList.length; i++) {
+        const itemLength = valueList[i];
+        const obj = {
+          idList: [],
+        };
+        for (let j = 0; j < itemLength.length; j++) {
+          const item = itemLength[j];
+          const splitList = item.split('-');
+          obj.idList.push(splitList[0]);
+          obj[`${areaConfig[j].value}`] = splitList[1];
+        }
+        value.push(obj);
+      }
+      return value;
+    }
+  }
+})
+</script>
+
+
+<style scoped lang="less">
+.base_area_by_multiple-wrap {
+  width: 100%;
+  height: auto;
+}
+</style>

package/packages/components/base/baseAreaByMultiple/index.js

@@ -0,0 +1,7 @@
+import baseAreaByMultiple from "./baseAreaByMultiple.vue"
+
+baseAreaByMultiple.install = function (Vue) {
+    Vue.component(baseAreaByMultiple.name, baseAreaByMultiple);
+};
+
+export default baseAreaByMultiple;

package/packages/components/index.js

@@ -3,6 +3,7 @@ exports.__esModule = true;
 var baseAnchor_1 = require("./base/baseAnchor");
 var baseAppendix_1 = require("./base/baseAppendix");
 var baseArea_1 = require("./base/baseArea");
+var baseAreaByMultiple_1 = require("./base/baseAreaByMultiple");
 var baseAvatar_1 = require("./base/baseAvatar");
 var baseButtonHandle_1 = require("./base/baseButtonHandle");
 var baseDefaultSvg_1 = require("./base/baseDefaultSvg");
@@ -94,6 +95,7 @@ var meixicomponents = [
     baseLineInfoGroup_1["default"],
     baseLineInfoItem_1["default"],
     basePageHeader_1["default"],
+    baseAreaByMultiple_1["default"],
     basePagination_1["default"],
     basePlainTable_1["default"],
     baseSection_1["default"],
@@ -176,6 +178,7 @@ var meixioacomponent = {
     basePagination: basePagination_1["default"],
     basePlainTable: basePlainTable_1["default"],
     baseSection: baseSection_1["default"],
+    baseAreaByMultiple: baseAreaByMultiple_1["default"],
     baseSkeleton: baseSkeleton_1["default"],
     baseSvg: baseSvg_1["default"],
     baseTimeTypeSelect: baseTimeTypeSelect_1["default"],

package/packages/components/index.ts

@@ -1,6 +1,7 @@
 import baseAnchor from "./base/baseAnchor";
 import baseAppendix from "./base/baseAppendix";
 import baseArea from "./base/baseArea";
+import baseAreaByMultiple from "./base/baseAreaByMultiple"
 import baseAvatar from "./base/baseAvatar";
 import baseButtonHandle from "./base/baseButtonHandle";
 import baseDefaultSvg from "./base/baseDefaultSvg";
@@ -98,6 +99,7 @@ const meixicomponents: any[] = [
     baseLineInfoGroup,
     baseLineInfoItem,
     basePageHeader,
+    baseAreaByMultiple,
     basePagination,
     basePlainTable,
     baseSection,
@@ -185,6 +187,7 @@ const meixioacomponent = {
     basePagination,
     basePlainTable,
     baseSection,
+    baseAreaByMultiple,
     baseSkeleton,
     baseSvg,
     baseTimeTypeSelect,

package/packages/components/mixins/mixinsByBaseArea.js

@@ -0,0 +1,54 @@
+import {GetAreaTree} from "../base/baseArea/api";
+
+export const mixinsByBaseArea = {
+    data() {
+        return {
+            loading: false,
+            options: [],
+            placeholder: '请选择省市区镇',
+        }
+    },
+    mounted() {
+        this.loadArea('').then(res => {
+            this.options = res;
+        })
+    },
+    props: {
+        disable: {
+            type: Boolean,
+            default: false,
+        },
+        size: {type: String, default: 'small'}
+    },
+    methods: {
+        load(node) {
+            const {value, data} = node;
+            return new Promise((resolve) => {
+                this.loadArea(data ? data.code : '').then(res => {
+                    resolve(res);
+                })
+            })
+        },
+        loadArea(keyword) {
+            return new Promise((resolve) => {
+                this.loading = true;
+                GetAreaTree({
+                    keyword: keyword
+                }).then(res => {
+                    if (Array.isArray(res)) {
+                        res.forEach(item => {
+                            item[`children`] = item.level !== 4;
+                            item[`value`] = `${item.name}-${item.code}`
+                        })
+                        this.loading = false;
+                        resolve(res);
+                    } else {
+                        resolve([]);
+                    }
+                })
+            })
+        },
+    }
+
+
+}

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

@@ -333,7 +333,6 @@ export default {
     formAreaConfirm(params) {
       this.submitVerifiData(params).then(res => {
         if (res) {
-          this.$refs[`area-${params.config.key}`][0].doClose()
           this.$emit('formItemConfirm', params.config)
         } else {
           this.$message.error('请重新选择')