feat: 修复部分组件属性变更问题,修复上传组件问题

75bce4a2 · Xuguangxing · 3d119a41 · 75bce4a2 · 75bce4a2 · 75bce4a2
Commit 75bce4a2 authored Jul 05, 2022 by Xuguangxing
7 changed files
--- a/app/web/page/editor/component/DynamicForm/component/CategoryTypeSelector/index.vue
+++ b/app/web/page/editor/component/DynamicForm/component/CategoryTypeSelector/index.vue
@@ -15,6 +15,9 @@ export default {
    }
  },
  watch: {
+    value(val) {
+      this.selected = val;
+    },
    selected(val) {
      this.$emit('input', val);  
    }

--- a/app/web/page/editor/component/DynamicForm/component/GoodsChannelTypeSelector/index.vue
+++ b/app/web/page/editor/component/DynamicForm/component/GoodsChannelTypeSelector/index.vue
@@ -15,6 +15,9 @@ export default {
    }
  },
  watch: {
+    value(val) {
+      this.selected = val;
+    },
    selected(val) {
      this.$emit('input', val);  
    }

--- a/app/web/page/editor/component/DynamicForm/component/GoodsPromotionTypeSelector/index.vue
+++ b/app/web/page/editor/component/DynamicForm/component/GoodsPromotionTypeSelector/index.vue
@@ -15,6 +15,9 @@ export default {
    }
  },
  watch: {
+    value(val) {
+      this.selected = val;
+    },
    selected(val) {
      this.$emit('input', val);  
    }

--- a/app/web/page/editor/component/DynamicForm/component/SwiperStyleTypeSelector/index.vue
+++ b/app/web/page/editor/component/DynamicForm/component/SwiperStyleTypeSelector/index.vue
@@ -15,6 +15,9 @@ export default {
    }
  },
  watch: {
+    value(val) {
+      this.selected = val;
+    },
    selected(val) {
      this.$emit('input', val);  
    }

--- a/app/web/page/editor/component/DynamicForm/component/Upload/index.vue
+++ b/app/web/page/editor/component/DynamicForm/component/Upload/index.vue
@@ -136,6 +136,7 @@
                  limit = 5 * 1024 * 1024;
                   if (size > limit) {
                    this.$toast('gif图大小不允许超过5Mb');
+                    up.removeFile(file);
                    return false;
                  }
                } else if (type.toLowerCase().indexOf('video/') === 0) {
@@ -144,6 +145,7 @@
                  limit = 4 * 1024 * 1024;
                  if (size > limit) {
                    this.$toast('文件大小不允许超过4Mb');
+                    up.removeFile(file);
                    return false;
                  }
                } else {
@@ -152,6 +154,7 @@
                  limit = 800 * 1024;
                  if (size > limit) {
                    this.$toast('文件大小不允许超过800Kb');
+                    up.removeFile(file);
                    return false;
                  }
                }

--- a/package-lock.json
+++ b/package-lock.json
@@ -2176,9 +2176,9 @@
      }
    },
    "@qg/citrus-ui": {
-      "version": "0.3.53-beta1",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.53-beta1.tgz",
-      "integrity": "sha512-sotg6LavIBsSH6I6kMB+k5OxOolW8SLT9ibtUfLGRxvOYD3jSFl4NL0//a435Oyi9heQNW3qFGqWwn7HYk5JLA==",
+      "version": "0.3.53-beta2",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.53-beta2.tgz",
+      "integrity": "sha512-7uPJn2SbOuTpMs022BM7SWUOvsZ7AjO75nCUtGWVJhg/xSnc40VQ9uWqBaK3NHQlPyHWLNG6iJPEa03PSGklgQ==",
      "requires": {
        "@better-scroll/core": "^2.1.1",
        "@qg/cherry-ui": "^2.23.9",

--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
    "@hubcarl/json-typescript-mapper": "^2.0.0",
    "@qg/apollo-nodejs": "^2.1.2",
    "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.53-beta1",
+    "@qg/citrus-ui": "0.3.53-beta2",
    "@riophae/vue-treeselect": "^0.4.0",
    "@types/lodash": "^4.14.117",
    "@types/node": "^10.12.0",