chenhaodong / mew-iview

Commit fe5ffd7f3f763bb67db596a0403012aaeadb854b

Authored by 梁灏
1 parent d7bcee71

fixed #4196 #4165

Showing 22 changed files with 26 additions and 26 deletions   Show diff stats
Inline Side-by-side
src/components/auto-complete/auto-complete.vue
  Show/Hide comments   View file @fe5ffd7
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 return oneOf(value, ['small', 'large', 'default']); 75 return oneOf(value, ['small', 'large', 'default']);
76 }, 76 },
77 default () { 77 default () {
78 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 78 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
79 } 79 }
80 }, 80 },
81 icon: { 81 icon: {
src/components/avatar/avatar.vue
  Show/Hide comments   View file @fe5ffd7
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 return oneOf(value, ['small', 'large', 'default']); 26 return oneOf(value, ['small', 'large', 'default']);
27 }, 27 },
28 default () { 28 default () {
29 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 29 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
30 } 30 }
31 }, 31 },
32 src: { 32 src: {
src/components/button/button-group.vue
  Show/Hide comments   View file @fe5ffd7
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 return oneOf(value, ['small', 'large', 'default']); 16 return oneOf(value, ['small', 'large', 'default']);
17 }, 17 },
18 default () { 18 default () {
19 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 19 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
20 } 20 }
21 }, 21 },
22 shape: { 22 shape: {
src/components/button/button.vue
  Show/Hide comments   View file @fe5ffd7
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 return oneOf(value, ['small', 'large', 'default']); 51 return oneOf(value, ['small', 'large', 'default']);
52 }, 52 },
53 default () { 53 default () {
54 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 54 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
55 } 55 }
56 }, 56 },
57 loading: Boolean, 57 loading: Boolean,
src/components/cascader/cascader.vue
  Show/Hide comments   View file @fe5ffd7
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 return oneOf(value, ['small', 'large', 'default']); 100 return oneOf(value, ['small', 'large', 'default']);
101 }, 101 },
102 default () { 102 default () {
103 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 103 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
104 } 104 }
105 }, 105 },
106 trigger: { 106 trigger: {
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 transfer: { 132 transfer: {
133 type: Boolean, 133 type: Boolean,
134 default () { 134 default () {
135 - return this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer; 135 + return !this.$IVIEW || this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer;
136 } 136 }
137 }, 137 },
138 name: { 138 name: {
src/components/checkbox/checkbox-group.vue
  Show/Hide comments   View file @fe5ffd7
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 return oneOf(value, ['small', 'large', 'default']); 24 return oneOf(value, ['small', 'large', 'default']);
25 }, 25 },
26 default () { 26 default () {
27 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 27 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
28 } 28 }
29 } 29 }
30 }, 30 },
src/components/checkbox/checkbox.vue
  Show/Hide comments   View file @fe5ffd7
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 return oneOf(value, ['small', 'large', 'default']); 65 return oneOf(value, ['small', 'large', 'default']);
66 }, 66 },
67 default () { 67 default () {
68 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 68 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
69 } 69 }
70 }, 70 },
71 name: { 71 name: {
src/components/color-picker/color-picker.vue
  Show/Hide comments   View file @fe5ffd7
@@ -172,7 +172,7 @@ export default { @@ -172,7 +172,7 @@ export default {
172 return oneOf(value, ['small', 'large', 'default']); 172 return oneOf(value, ['small', 'large', 'default']);
173 }, 173 },
174 default () { 174 default () {
175 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 175 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
176 } 176 }
177 }, 177 },
178 hideDropDown: { 178 hideDropDown: {
@@ -202,7 +202,7 @@ export default { @@ -202,7 +202,7 @@ export default {
202 transfer: { 202 transfer: {
203 type: Boolean, 203 type: Boolean,
204 default () { 204 default () {
205 - return this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer; 205 + return !this.$IVIEW || this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer;
206 } 206 }
207 }, 207 },
208 name: { 208 name: {
src/components/date-picker/picker.vue
  Show/Hide comments   View file @fe5ffd7
@@ -173,7 +173,7 @@ @@ -173,7 +173,7 @@
173 return oneOf(value, ['small', 'large', 'default']); 173 return oneOf(value, ['small', 'large', 'default']);
174 }, 174 },
175 default () { 175 default () {
176 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 176 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
177 } 177 }
178 }, 178 },
179 placeholder: { 179 placeholder: {
@@ -189,7 +189,7 @@ @@ -189,7 +189,7 @@
189 transfer: { 189 transfer: {
190 type: Boolean, 190 type: Boolean,
191 default () { 191 default () {
192 - return this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer; 192 + return !this.$IVIEW || this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer;
193 } 193 }
194 }, 194 },
195 name: { 195 name: {
src/components/dropdown/dropdown.vue
  Show/Hide comments   View file @fe5ffd7
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 transfer: { 50 transfer: {
51 type: Boolean, 51 type: Boolean,
52 default () { 52 default () {
53 - return this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer; 53 + return !this.$IVIEW || this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer;
54 } 54 }
55 } 55 }
56 }, 56 },
src/components/input-number/input-number.vue
  Show/Hide comments   View file @fe5ffd7
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 return oneOf(value, ['small', 'large', 'default']); 91 return oneOf(value, ['small', 'large', 'default']);
92 }, 92 },
93 default () { 93 default () {
94 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 94 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
95 } 95 }
96 }, 96 },
97 disabled: { 97 disabled: {
src/components/input/input.vue
  Show/Hide comments   View file @fe5ffd7
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 return oneOf(value, ['small', 'large', 'default']); 92 return oneOf(value, ['small', 'large', 'default']);
93 }, 93 },
94 default () { 94 default () {
95 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 95 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
96 } 96 }
97 }, 97 },
98 placeholder: { 98 placeholder: {
src/components/modal/modal.vue
  Show/Hide comments   View file @fe5ffd7
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 transfer: { 100 transfer: {
101 type: Boolean, 101 type: Boolean,
102 default () { 102 default () {
103 - return this.$IVIEW.transfer === '' ? true : this.$IVIEW.transfer; 103 + return !this.$IVIEW || this.$IVIEW.transfer === '' ? true : this.$IVIEW.transfer;
104 } 104 }
105 }, 105 },
106 fullscreen: { 106 fullscreen: {
src/components/page/page.vue
  Show/Hide comments   View file @fe5ffd7
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 transfer: { 107 transfer: {
108 type: Boolean, 108 type: Boolean,
109 default () { 109 default () {
110 - return this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer; 110 + return !this.$IVIEW || this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer;
111 } 111 }
112 }, 112 },
113 size: { 113 size: {
src/components/poptip/poptip.vue
  Show/Hide comments   View file @fe5ffd7
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 transfer: { 97 transfer: {
98 type: Boolean, 98 type: Boolean,
99 default () { 99 default () {
100 - return this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer; 100 + return !this.$IVIEW || this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer;
101 } 101 }
102 }, 102 },
103 popperClass: { 103 popperClass: {
src/components/radio/radio-group.vue
  Show/Hide comments   View file @fe5ffd7
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 return oneOf(value, ['small', 'large', 'default']); 26 return oneOf(value, ['small', 'large', 'default']);
27 }, 27 },
28 default () { 28 default () {
29 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 29 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
30 } 30 }
31 }, 31 },
32 type: { 32 type: {
src/components/radio/radio.vue
  Show/Hide comments   View file @fe5ffd7
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 return oneOf(value, ['small', 'large', 'default']); 48 return oneOf(value, ['small', 'large', 'default']);
49 }, 49 },
50 default () { 50 default () {
51 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 51 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
52 } 52 }
53 }, 53 },
54 name: { 54 name: {
src/components/select/select.vue
  Show/Hide comments   View file @fe5ffd7
@@ -189,7 +189,7 @@ @@ -189,7 +189,7 @@
189 return oneOf(value, ['small', 'large', 'default']); 189 return oneOf(value, ['small', 'large', 'default']);
190 }, 190 },
191 default () { 191 default () {
192 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 192 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
193 } 193 }
194 }, 194 },
195 labelInValue: { 195 labelInValue: {
@@ -208,7 +208,7 @@ @@ -208,7 +208,7 @@
208 transfer: { 208 transfer: {
209 type: Boolean, 209 type: Boolean,
210 default () { 210 default () {
211 - return this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer; 211 + return !this.$IVIEW || this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer;
212 } 212 }
213 }, 213 },
214 // Use for AutoComplete 214 // Use for AutoComplete
src/components/spin/spin.vue
  Show/Hide comments   View file @fe5ffd7
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 return oneOf(value, ['small', 'large', 'default']); 23 return oneOf(value, ['small', 'large', 'default']);
24 }, 24 },
25 default () { 25 default () {
26 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 26 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
27 } 27 }
28 }, 28 },
29 fix: { 29 fix: {
src/components/switch/switch.vue
  Show/Hide comments   View file @fe5ffd7
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 return oneOf(value, ['large', 'small', 'default']); 43 return oneOf(value, ['large', 'small', 'default']);
44 }, 44 },
45 default () { 45 default () {
46 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 46 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
47 } 47 }
48 }, 48 },
49 name: { 49 name: {
src/components/table/table.vue
  Show/Hide comments   View file @fe5ffd7
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 return oneOf(value, ['small', 'large', 'default']); 132 return oneOf(value, ['small', 'large', 'default']);
133 }, 133 },
134 default () { 134 default () {
135 - return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; 135 + return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
136 } 136 }
137 }, 137 },
138 width: { 138 width: {
src/components/tooltip/tooltip.vue
  Show/Hide comments   View file @fe5ffd7
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 transfer: { 61 transfer: {
62 type: Boolean, 62 type: Boolean,
63 default () { 63 default () {
64 - return this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer; 64 + return !this.$IVIEW || this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer;
65 } 65 }
66 }, 66 },
67 theme: { 67 theme: {