meixioacomponent 0.3.24 → 0.3.27

package/package.json

@@ -1,42 +1,42 @@
 {
-  "name": "meixioacomponent",
-  "version": "0.3.24",
-  "private": false,
-  "author": "YuRi",
-  "main": "lib/meixioacomponent.umd.min.js",
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "lib": "vue-cli-service build --target lib --name meixioacomponent --dest lib packages/components/index.js",
-    "build:theme": "cp-cli packages/components/style/ lib/style"
-  },
-  "dependencies": {
-    "axios": "^0.27.2",
-    "core-js": "^3.6.5",
-    "cp-cli": "^1.0.2",
-    "dayjs": "^1.11.3",
-    "element-ui": "^2.15.6",
-    "gulp": "^4.0.0",
-    "register-service-worker": "^1.7.1",
-    "vue": "^2.6.11",
-    "vue-router": "^3.2.0",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.4.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.13",
-    "@vue/cli-plugin-pwa": "~4.5.13",
-    "@vue/cli-plugin-router": "~4.5.13",
-    "@vue/cli-plugin-vuex": "~4.5.13",
-    "@vue/cli-service": "~4.5.13",
-    "babel-plugin-component": "^1.1.1",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "less": "^3.0.4",
-    "less-loader": "^5.0.0",
-    "vue-template-compiler": "^2.6.11"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
-}
+    "name": "meixioacomponent",
+    "version": "0.3.27",
+    "private": false,
+    "author": "YuRi",
+    "main": "lib/meixioacomponent.umd.min.js",
+    "scripts": {
+        "serve": "vue-cli-service serve",
+        "lib": "vue-cli-service build --target lib --name meixioacomponent --dest lib packages/components/index.js",
+        "build:theme": "cp-cli packages/components/style/ lib/style"
+    },
+    "dependencies": {
+        "axios": "^0.27.2",
+        "core-js": "^3.6.5",
+        "cp-cli": "^1.0.2",
+        "dayjs": "^1.11.3",
+        "element-ui": "^2.15.6",
+        "gulp": "^4.0.0",
+        "register-service-worker": "^1.7.1",
+        "vue": "^2.6.11",
+        "vue-router": "^3.2.0",
+        "vuedraggable": "^2.24.3",
+        "vuex": "^3.4.0"
+    },
+    "devDependencies": {
+        "@vue/cli-plugin-babel": "~4.5.13",
+        "@vue/cli-plugin-pwa": "~4.5.13",
+        "@vue/cli-plugin-router": "~4.5.13",
+        "@vue/cli-plugin-vuex": "~4.5.13",
+        "@vue/cli-service": "~4.5.13",
+        "babel-plugin-component": "^1.1.1",
+        "babel-plugin-transform-remove-console": "^6.9.4",
+        "less": "^3.0.4",
+        "less-loader": "^5.0.0",
+        "vue-template-compiler": "^2.6.11"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not dead"
+    ]
+}

package/packages/components/base/baseAvatar/baseAvatar.vue

@@ -8,6 +8,8 @@
         :color="`d`"
         :plain="true"
         :name="source"
+        :event="event"
+        @iconClick="iconClick"
         v-else-if="type == 'icon'"
       >
       </base-icon>
@@ -45,6 +47,10 @@ export default {
       default: false,
     },
     value: {},
+    event:{
+      type:Boolean,
+      default:false,
+    },
   },
   computed: {
     module: {
@@ -56,6 +62,11 @@ export default {
       },
     },
   },
+  methods:{
+    iconClick(){
+      this.$emit('iconClick');
+    }
+  }
 };
 </script>
 

package/packages/components/base/baseDrawer/index.vue

@@ -11,6 +11,7 @@
     :destroy-on-close="destroyOnClose"
     :wrapperClosable="wrapperClosable"
     :modal-append-to-body="appendToBody"
+    @closed="drawerClosed"
   >
     <!-- 插槽插入你需要渲染的内容 -->
     <div class="drawer-content-wrap">
@@ -137,14 +138,19 @@ export default {
       });
     },
 
+    drawerClosed() {
+      const { destroyOnClose } = this.$props;
+      if (destroyOnClose) {
+        this.$nextTick(() => {
+          this.$destroy();
+          this.$parent.$destroy();
+        });
+      }
+    },
+
     hiddenDrawer() {
       if (this.isExis()) {
         this.$refs.drawer.closeDrawer();
-
-        const { destroyOnClose } = this.$props;
-        if (destroyOnClose) {
-          this.$destroy();
-        }
       }
     },
 

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

@@ -328,14 +328,14 @@ export default {
             return this.$props.config.value;
           }
 
-        case "time":
-          if (this.module) {
-            let config = this.$props.config;
-            let format = config.format ? config.format : "YYYY-MM-DD";
-            return FilterTime(this.module, format);
-          } else {
-            return "暂无时间";
-          }
+        // case "time":
+        //   if (this.module) {
+        //     let config = this.$props.config;
+        //     let format = config.format ? config.format : "YYYY-MM-DD";
+        //     return FilterTime(this.module, format);
+        //   } else {
+        //     return "暂无时间";
+        //   }
 
         default:
           return this.module;

package/src/App.vue

@@ -0,0 +1,65 @@
+<template>
+  <div id="app">
+    <div style="height: 100vh">
+      <test />
+
+      <!-- <base-time-line
+        :hasTimeWeek="false"
+        :timeLineSource="items"
+      ></base-time-line> -->
+
+      <!-- <base-popover-button
+       v-model="test" 
+        iconClass="element"
+        buttonIcon="el-icon-delete-solid"
+      ></base-popover-button>
+
+      <base-icon  iconClass="element" name="el-icon-delete-solid" :event="true"> </base-icon> -->
+    </div>
+  </div>
+</template>
+
+<script>
+import test from "./component/test.vue";
+
+import BaseArea from "../packages/components/base/baseArea/baseArea.vue";
+import BaseTimeLine from "../packages/components/base/baseTimeLine/baseTimeLine.vue";
+export default {
+  components: { test, BaseArea, BaseTimeLine },
+  data() {
+    return {
+      test: [],
+      items: [
+        { type: "", label: "标签一" },
+        { type: "success", label: "标签二" },
+        { type: "info", label: "标签三" },
+        { type: "danger", label: "标签四" },
+        { type: "warning", label: "标签五" },
+      ],
+      value: [],
+      value2: [],
+      value3: [],
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+.add-company-step-three-wrap {
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
+  .upload-wrap {
+    width: 100%;
+    height: 170px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    /deep/ .base-upload-item-wrap {
+      margin: 0px;
+    }
+  }
+}
+</style>