cy-element-ui 1.0.70 → 1.0.72

package/packages/form/src/form-item.vue

@@ -40,9 +40,9 @@
 </template>
 <script>
 	import AsyncValidator from 'async-validator';
-	import emitter from '../../../src/mixins/emitter';
-	import objectAssign from '../../../src/utils/merge';
-	import { noop, getPropByPath } from '../../../src/utils/util';
+	import emitter from 'element-ui/src/mixins/emitter';
+	import objectAssign from 'element-ui/src/utils/merge';
+	import { noop, getPropByPath } from 'element-ui/src/utils/util';
 	import LabelWrap from './label-wrap';
 	export default {
 		name: 'ElFormItem',

package/packages/theme-chalk/src/index.scss

@@ -85,4 +85,3 @@
 @import "./descriptions.scss";
 @import "./descriptions-item.scss";
 @import "./result.scss";
-

package/packages/theme-chalk/src/mixins/mixins.scss

@@ -1,210 +1,190 @@
-@import "function";
-@import "../common/var";
-
-/* Break-points
- -------------------------- */
-@mixin res($key, $map: $--breakpoints) {
-	// 循环断点Map，如果存在则返回
-	@if map-has-key($map, $key) {
-		$bp: map-get($map, $key);
-		
-		// 检查是否是字符串（预编译的媒体查询）
-		@if type-of($bp) == string {
-			@media only screen and #{$bp} {
-				@content;
-			}
-		} @else {
-			// 处理 map 类型的断点
-			$min: map-get($bp, min-width);
-			$max: map-get($bp, max-width);
-			
-			$conditions: ();
-			@if $min {
-				$conditions: append($conditions, "(min-width: #{$min})");
-			}
-			@if $max {
-				$conditions: append($conditions, "(max-width: #{$max})");
-			}
-			
-			@media only screen and #{if(length($conditions) > 1, join($conditions, " and "), nth($conditions, 1))} {
-				@content;
-			}
-		}
-	} @else {
-		@warn "Undefeined points: `#{$map}`";
-	}
-}
-
-/* Scrollbar
- -------------------------- */
-@mixin scroll-bar {
-	$--scrollbar-thumb-background: #b4bccc;
-	$--scrollbar-track-background: #fff;
-
-	&::-webkit-scrollbar {
-		z-index: 11;
-		width: 6px;
-
-		&:horizontal {
-			height: 6px;
-		}
-
-		&-thumb {
-			border-radius: 5px;
-			width: 6px;
-			background: $--scrollbar-thumb-background;
-		}
-
-		&-corner {
-			background: $--scrollbar-track-background;
-		}
-
-		&-track {
-			background: $--scrollbar-track-background;
-
-			&-piece {
-				background: $--scrollbar-track-background;
-				width: 6px;
-			}
-		}
-	}
-}
-
-/* Placeholder
- -------------------------- */
-@mixin placeholder {
-	&::-webkit-input-placeholder {
-		@content
-	}
-
-	&::-moz-placeholder {
-		@content
-	}
-
-	&:-ms-input-placeholder {
-		@content
-	}
-}
-
-/* BEM
- -------------------------- */
-@mixin b($block) {
-	$B: $namespace+'-'+$block !global;
-
-	.#{$B} {
-		@content;
-	}
-}
-
-@mixin e($element) {
-	$E: $element !global;
-	$selector: &;
-	$currentSelector: "";
-	@each $unit in $element {
-		$currentSelector: #{$currentSelector + "." + $B + $element-separator + $unit + ","};
-	}
-
-	@if hitAllSpecialNestRule($selector) {
-		@at-root {
-			#{$selector} {
-				#{$currentSelector} {
-					@content;
-				}
-			}
-		}
-	} @else {
-		@at-root {
-			#{$currentSelector} {
-				@content;
-			}
-		}
-	}
-}
-
-@mixin m($modifier) {
-	$selector: &;
-	$currentSelector: "";
-	@each $unit in $modifier {
-		$currentSelector: #{$currentSelector + & + $modifier-separator + $unit + ","};
-	}
-
-	@at-root {
-		#{$currentSelector} {
-			@content;
-		}
-	}
-}
-
-@mixin configurable-m($modifier, $E-flag: false) {
-	$selector: &;
-	$interpolation: '';
-
-	@if $E-flag {
-		$interpolation: $element-separator + $E-flag;
-	}
-
-	@at-root {
-		#{$selector} {
-			.#{$B+$interpolation+$modifier-separator+$modifier} {
-				@content;
-			}
-		}
-	}
-}
-
-@mixin spec-selector($specSelector: '', $element: $E, $modifier: false, $block: $B) {
-	$modifierCombo: '';
-
-	@if $modifier {
-		$modifierCombo: $modifier-separator + $modifier;
-	}
-
-	@at-root {
-		#{&}#{$specSelector}.#{$block+$element-separator+$element+$modifierCombo} {
-			@content
-		}
-	}
-}
-
-@mixin meb($modifier: false, $element: $E, $block: $B) {
-	$selector: &;
-	$modifierCombo: '';
-
-	@if $modifier {
-		$modifierCombo: $modifier-separator + $modifier;
-	}
-
-	@at-root {
-		#{$selector} {
-			.#{$block+$element-separator+$element+$modifierCombo} {
-				@content
-			}
-		}
-	}
-}
-
-@mixin when($state) {
-	@at-root {
-		&.#{$state-prefix + $state} {
-			@content;
-		}
-	}
-}
-
-@mixin extend-rule($name) {
-	@extend #{'%shared-'+$name};
-}
-
-@mixin share-rule($name) {
-	$rule-name: '%shared-'+$name;
-
-	@at-root #{$rule-name} {
-		@content
-	}
-}
-
-@mixin pseudo($pseudo) {
-	@at-root #{&}#{':#{$pseudo}'} {
-		@content
-	}
-}
+@import "function";
+@import "../common/var";
+
+/* Break-points
+ -------------------------- */
+@mixin res($key, $map: $--breakpoints) {
+	// 循环断点Map，如果存在则返回
+	@if map-has-key($map, $key) {
+		@media only screen and #{inspect(map-get($map, $key))} {
+			@content;
+		}
+	} @else {
+		@warn "Undefeined points: `#{$map}`";
+	}
+}
+
+/* Scrollbar
+ -------------------------- */
+@mixin scroll-bar {
+	$--scrollbar-thumb-background: #b4bccc;
+	$--scrollbar-track-background: #fff;
+
+	&::-webkit-scrollbar {
+		z-index: 11;
+		width: 6px;
+
+		&:horizontal {
+			height: 6px;
+		}
+
+		&-thumb {
+			border-radius: 5px;
+			width: 6px;
+			background: $--scrollbar-thumb-background;
+		}
+
+		&-corner {
+			background: $--scrollbar-track-background;
+		}
+
+		&-track {
+			background: $--scrollbar-track-background;
+
+			&-piece {
+				background: $--scrollbar-track-background;
+				width: 6px;
+			}
+		}
+	}
+}
+
+/* Placeholder
+ -------------------------- */
+@mixin placeholder {
+	&::-webkit-input-placeholder {
+		@content
+	}
+
+	&::-moz-placeholder {
+		@content
+	}
+
+	&:-ms-input-placeholder {
+		@content
+	}
+}
+
+/* BEM
+ -------------------------- */
+@mixin b($block) {
+	$B: $namespace+'-'+$block !global;
+
+	.#{$B} {
+		@content;
+	}
+}
+
+@mixin e($element) {
+	$E: $element !global;
+	$selector: &;
+	$currentSelector: "";
+	@each $unit in $element {
+		$currentSelector: #{$currentSelector + "." + $B + $element-separator + $unit + ","};
+	}
+
+	@if hitAllSpecialNestRule($selector) {
+		@at-root {
+			#{$selector} {
+				#{$currentSelector} {
+					@content;
+				}
+			}
+		}
+	} @else {
+		@at-root {
+			#{$currentSelector} {
+				@content;
+			}
+		}
+	}
+}
+
+@mixin m($modifier) {
+	$selector: &;
+	$currentSelector: "";
+	@each $unit in $modifier {
+		$currentSelector: #{$currentSelector + & + $modifier-separator + $unit + ","};
+	}
+
+	@at-root {
+		#{$currentSelector} {
+			@content;
+		}
+	}
+}
+
+@mixin configurable-m($modifier, $E-flag: false) {
+	$selector: &;
+	$interpolation: '';
+
+	@if $E-flag {
+		$interpolation: $element-separator + $E-flag;
+	}
+
+	@at-root {
+		#{$selector} {
+			.#{$B+$interpolation+$modifier-separator+$modifier} {
+				@content;
+			}
+		}
+	}
+}
+
+@mixin spec-selector($specSelector: '', $element: $E, $modifier: false, $block: $B) {
+	$modifierCombo: '';
+
+	@if $modifier {
+		$modifierCombo: $modifier-separator + $modifier;
+	}
+
+	@at-root {
+		#{&}#{$specSelector}.#{$block+$element-separator+$element+$modifierCombo} {
+			@content
+		}
+	}
+}
+
+@mixin meb($modifier: false, $element: $E, $block: $B) {
+	$selector: &;
+	$modifierCombo: '';
+
+	@if $modifier {
+		$modifierCombo: $modifier-separator + $modifier;
+	}
+
+	@at-root {
+		#{$selector} {
+			.#{$block+$element-separator+$element+$modifierCombo} {
+				@content
+			}
+		}
+	}
+}
+
+@mixin when($state) {
+	@at-root {
+		&.#{$state-prefix + $state} {
+			@content;
+		}
+	}
+}
+
+@mixin extend-rule($name) {
+	@extend #{'%shared-'+$name};
+}
+
+@mixin share-rule($name) {
+	$rule-name: '%shared-'+$name;
+
+	@at-root #{$rule-name} {
+		@content
+	}
+}
+
+@mixin pseudo($pseudo) {
+	@at-root #{&}#{':#{$pseudo}'} {
+		@content
+	}
+}
+

package/src/index.js

@@ -221,7 +221,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-	version: '1.0.70',
+	version: '1.0.72',
 	locale: locale.use,
 	i18n: locale.i18n,
 	install,