meixioacomponent 1.1.52 → 1.1.53

package/package.json

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

package/packages/components/base/{baseArea → area/baseArea}/baseArea.vue

@@ -92,7 +92,7 @@
 
 <script>
 import {json} from 'body-parser'
-import baseButtonHandleVue from '../baseButtonHandle/baseButtonHandle.vue'
+import baseButtonHandleVue from '../../baseButtonHandle/baseButtonHandle.vue'
 //
 import areaJson from './area'
 import areaConfig from './areaConfig'

package/packages/components/base/{baseArea → area/baseArea}/baseAreaV2.vue

@@ -4,7 +4,6 @@
         ref="cascader"
         :disabled="disable||loading"
         :props="treeProps" :size="size" @change="onChange"
-        @expand-change="onExpandChange"
         :placeholder="placeholder"
         v-model="localValue">
       <template #empty>
@@ -16,46 +15,23 @@
 </template>
 
 <script>
-import baseButtonHandleVue from '../baseButtonHandle/baseButtonHandle.vue'
-import {GetAreaTree} from "./api";
 import areaConfig from "./areaConfig";
+import {mixinsByArea} from "../mixins/mixinsByArea";
 //
 
 export default {
   name: 'baseArea',
   data() {
     return {
-      loading: false,
       localValue: '',
       localDetailValue: {},
-      treeProps: {
-        lazy: true,
-        value: 'name',
-        label: 'name',
-        leaf: 'leaf',
-        lazyLoad: (node, resolve) => {
-          const {level, value, data} = node;
-          this.loading = true;
-          GetAreaTree({
-            keyword: data ? data.code : ''
-          }).then(res => {
-            if (Array.isArray(res)) {
-              res.forEach(item => {
-                item[`leaf`] = item.level === 4;
-              })
-              this.loading = false;
-              resolve(res);
-            } else {
-              resolve([]);
-            }
-          })
-        }
-      },
-      placeholder: '请选择省市区镇'
     }
   },
   created() {
   },
+  mixins: [
+    mixinsByArea
+  ],
 
   mounted() {
     if (this.module) {
@@ -78,15 +54,6 @@ export default {
     value: {
       default: null,
     },
-    disable: {
-      type: Boolean,
-      default: false,
-    },
-    size: {type: String, default: 'small'}
-  },
-
-  components: {
-    baseButtonHandleVue,
   },
   computed: {
     module: {
@@ -108,10 +75,6 @@ export default {
       this.$emit('confirmAreaValue', _value)
       this.module = _value;
     },
-    onExpandChange(value) {
-      // console.log('onExpandChange')
-      // console.log(value);
-    },
     onAreaChange(value) {
       try {
         const {level, label, data} = value;
@@ -134,11 +97,6 @@ export default {
       }
     },
   },
-  watch: {
-    module(newVal, oldVal) {
-
-    },
-  },
 }
 </script>
 

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

@@ -0,0 +1,82 @@
+<template>
+  <div class="base_area_multiple-wrap">
+    <el-cascader
+        ref="cascader"
+        :disabled="disable||loading"
+        :props="{
+          ...treeProps,
+           multiple: true,
+           checkStrictly: true
+        }" :size="size"
+        :placeholder="placeholder">
+      <template #empty>
+        <el-empty description="正在加载数据中" v-if="loading"></el-empty>
+        <el-empty v-else description="暂无数据"></el-empty>
+      </template>
+    </el-cascader>
+  </div>
+</template>
+
+
+<script>
+/**
+ * 该组件不支持回显数据
+ */
+import {defineComponent} from 'vue'
+import {mixinsByArea} from "../mixins/mixinsByArea";
+import areaConfig from "../baseArea/areaConfig";
+
+export default defineComponent({
+  name: "baseAreaByMultiple",
+  data() {
+    return {
+      tempItem: {},
+    }
+  },
+  mixins: [mixinsByArea],
+  methods: {
+    getCheckValue() {
+      const valueList = [];
+      const checkNodesList = this.$refs.cascader.getCheckedNodes(false);
+      for (let i = 0; i < checkNodesList.length; i++) {
+        const item = checkNodesList[i];
+        this.onAreaChange(item, valueList);
+      }
+
+      return valueList;
+    },
+
+    onAreaChange(value, list) {
+      try {
+        const {level, label, data} = value;
+        if (!level) return;
+        for (let i = 0; i < level; i++) {
+          this.tempItem[`${areaConfig[i].value}`] = null;
+        }
+        if (!this.tempItem[`idList`]) {
+          this.tempItem[`idList`] = [];
+        }
+        this.tempItem[`${areaConfig[level - 1].value}`] = label;
+        this.tempItem[`idList`][level - 1] = data.code;
+        if (!value.parent) {
+          list.push(JSON.parse(JSON.stringify(this.tempItem)));
+          this.tempItem = {};
+          return;
+        }
+        this.onAreaChange(value.parent, list);
+      } catch (error) {
+        console.log(error);
+      }
+    },
+  }
+})
+</script>
+
+
+<style scoped lang="less">
+.base_area_multiple-wrap {
+  width: 100%;
+  height: auto;
+}
+
+</style>

package/packages/components/base/area/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/base/area/mixins/mixinsByArea.js

@@ -0,0 +1,33 @@
+import {GetAreaTree} from "../baseArea/api";
+
+export const mixinsByArea = {
+
+    data() {
+        return {
+            loading: false, treeProps: {
+                lazy: true, value: 'name', label: 'name', leaf: 'leaf', lazyLoad: (node, resolve) => {
+                    const {level, value, data} = node;
+                    this.loading = true;
+                    GetAreaTree({
+                        keyword: data ? data.code : ''
+                    }).then(res => {
+                        if (Array.isArray(res)) {
+                            res.forEach(item => {
+                                item[`leaf`] = item.level === 4;
+                            })
+                            this.loading = false;
+                            resolve(res);
+                        } else {
+                            resolve([]);
+                        }
+                    })
+                }
+            }, placeholder: '请选择省市区镇'
+        }
+    }, props: {
+        size: {type: String, default: 'small'}, disable: {
+            type: Boolean, default: false,
+        },
+    }
+
+}

package/packages/components/index.js

@@ -2,7 +2,8 @@
 exports.__esModule = true;
 var baseAnchor_1 = require("./base/baseAnchor");
 var baseAppendix_1 = require("./base/baseAppendix");
-var baseArea_1 = require("./base/baseArea");
+var baseArea_1 = require("./base/area/baseArea");
+var baseAreaByMultiple_1 = require("./base/area/baseAreaByMultiple");
 var baseAvatar_1 = require("./base/baseAvatar");
 var baseButtonHandle_1 = require("./base/baseButtonHandle");
 var baseDefaultSvg_1 = require("./base/baseDefaultSvg");
@@ -106,6 +107,7 @@ var meixicomponents = [
     index_3["default"],
     baseMoverVerifiBar_1["default"],
     baseTimeLine_1["default"],
+    baseAreaByMultiple_1["default"],
     basePopoverButton_1["default"],
     baseTreeSelect_1["default"],
     baseUploadTemplate_1["default"],
@@ -121,7 +123,7 @@ var meixicomponents = [
     baseWait_1["default"],
     vuedraggable_1["default"],
     baseUploadImgAndName_1["default"],
-    elDatePicker_1["default"]
+    elDatePicker_1["default"],
 ];
 var install = function (Vue) {
     componentConfig_1["default"].Vue = Vue;
@@ -195,6 +197,7 @@ var meixioacomponent = {
     baseGuide: baseGuide_1["default"],
     baseText: baseText_1["default"],
     baseTag: baseTag_1["default"],
+    baseAreaByMultiple: baseAreaByMultiple_1["default"],
     elDatePicker: elDatePicker_1["default"],
     oaProTableSearch: oaProTableSearch_1["default"],
     baseWait: baseWait_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 baseArea from "./base/area/baseArea";
+import baseAreaByMultiple from "./base/area/baseAreaByMultiple"
 import baseAvatar from "./base/baseAvatar";
 import baseButtonHandle from "./base/baseButtonHandle";
 import baseDefaultSvg from "./base/baseDefaultSvg";
@@ -108,6 +109,7 @@ const meixicomponents: any[] = [
     baseProTable,
     baseMoverVerifiBar,
     baseTimeLine,
+    baseAreaByMultiple,
     basePopoverButton,
     baseTreeSelect,
     baseUploadTemplate,
@@ -123,7 +125,8 @@ const meixicomponents: any[] = [
     baseWait,
     draggable,
     baseUploadImgAndName,
-    elDatePicker
+    elDatePicker,
+
 ];
 
 const install = (Vue) => {
@@ -202,6 +205,7 @@ const meixioacomponent = {
     baseGuide,
     baseText,
     baseTag,
+    baseAreaByMultiple,
     elDatePicker,
     oaProTableSearch,
     baseWait,

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

@@ -125,14 +125,14 @@
 
 <script>
 import pro_form_itemVue from './proFormItem/pro_form_item.vue'
-import baseAreaV2 from "../../base/baseArea/baseAreaV2.vue";
+import baseAreaV2 from "../../base/area/baseArea/baseAreaV2.vue";
 import baseUploadVue from '../../base/baseUpload/baseUpload.vue'
 import pro_formItem_skeletonVue from './pro_form-item_skeleton.vue'
 import baseButtonHandleVue from '../../base/baseButtonHandle/baseButtonHandle.vue'
 //
 import {ArrayChunk} from '../../../utils/utils'
 import BaseNumberInput from '../../base/baseNumberInput/index.vue'
-import BaseArea from "../../base/baseArea/baseArea.vue";
+import BaseArea from "../../base/area/baseArea/baseArea.vue";
 
 export default {
   name: 'baseForm',