Merge pull request #518 from DaoCloud/release/1.0.4

Release/1.0.4

changelogs/v1.0.4.md

@@ -0,0 +1,18 @@
+<a name="1.0.4"></a>
+# 1.0.4 (2018-06-14)
+
+
+## Bug Fixes
+
+- **icon:** fix menu item checkmark icon
+  ([4f2e141c](https://github.com/DaoCloud/dao-style-vue/commit/4f2e141c989bb9dc42bc711bd5c4698be197207b))
+- **numeric-input:** fix component name dao-numberic-input to dao-numeric-input and add block feature
+  ([050455af](https://github.com/DaoCloud/dao-style-vue/commit/050455afe2d5f8f4b1ea91eee7e85dc3bb511292))
+- **panel:**
+  - 修复当改变 dao-panel 大小时，dao-panel内部文字会被选中的问题
+  ([38cc6019](https://github.com/DaoCloud/dao-style-vue/commit/38cc6019e256434056edbf840a93ff3b45c6351b))
+  - 修复 dao-panel-divider 被遮掉一半的问题
+  ([6f2d1beb](https://github.com/DaoCloud/dao-style-vue/commit/6f2d1bebeb8de74e1cda8337750bbb0418b11bbb))
+- **tooltip:** 修复 tootip 当定位不正确的时候，tooltip 会闪烁的问题
+  ([1b21245d](https://github.com/DaoCloud/dao-style-vue/commit/1b21245dfcf31ba76d27ccdad99363be959eb606))
+

examples/routers/input.vue

@@ -291,32 +291,30 @@
     </dao-file-input>
 
     <br><br><br>
-    <h1>Numberic Input</h1>
-    <hr><br>{{demoNumbericInput1}}<br>
-    <dao-numberic-input
-      v-model="demoNumbericInput1"
+    <h1>Numeric Input</h1>
+    <hr><br>{{demoNumericInput1}}<br>
+    <dao-numeric-input
+      v-model="demoNumericInput1"
       :min='-5'
       :max='80'
-      style="width: 287px;"
       placeholder="min: -5 max: 80 float">
-    </dao-numberic-input>
-    <br>{{demoNumbericInput2}}<br>
-     <dao-numberic-input
-      v-model="demoNumbericInput2"
-      style="width: 287px;"
+    </dao-numeric-input>
+    <br>{{demoNumericInput2}}<br>
+     <dao-numeric-input
+      v-model="demoNumericInput2"
       type='int'
       :min='-5'
       :max='10'
       unit="KG"
+      block
       placeholder="min: -5 max: 10 int">
-    </dao-numberic-input>
-    <br>{{demoNumbericInput3}}<br>
-    <dao-numberic-input
+    </dao-numeric-input>
+    <br>{{demoNumericInput3}}<br>
+    <dao-numeric-input
       :disabled="true"
-      v-model="demoNumbericInput3"
-      style="width: 287px;"
+      v-model="demoNumericInput3"
       placeholder="disabled">
-    </dao-numberic-input>
+    </dao-numeric-input>
     <br><br><br><br><br>
   </div>
 </template>
@@ -356,9 +354,9 @@
         statusSuccess: 'success',
         statusInfo: 'info',
         demoFileInput: null,
-        demoNumbericInput1: 1,
-        demoNumbericInput2: 2,
-        demoNumbericInput3: 3,
+        demoNumericInput1: 1,
+        demoNumericInput2: 2,
+        demoNumericInput3: 3,
       };
     },
     methods: {

src/components/dao-input/dao-numberic-input.scss → src/components/dao-input/dao-numeric-input.scss

@@ -1,11 +1,19 @@
 @import "../dao-color.scss";
+@import "./variables.scss";
 
 $unit-width: 32px;
 $triangle-width: 14px;
 $input-padding: 10px;
 
-.dao-numberic-input {
+.dao-numeric-input {
   position: relative;
+  width: $input-width;
+  &.block {
+    width: 100%;
+    input {
+      width: 100%;
+    }
+  }
   input{
     padding-right: $input-padding;
   }

src/components/dao-input/dao-numberic-input.vue → src/components/dao-input/dao-numeric-input.vue

@@ -38,7 +38,7 @@
   }
 
   export default {
-    name: 'DaoNumbericInput',
+    name: 'DaoNumericInput',
     props: {
       min: Number,
       max: Number,
@@ -60,6 +60,10 @@
         type: Boolean,
         default: false,
       },
+      block: {
+        type: Boolean,
+        default: false,
+      },
     },
     data() {
       return {
@@ -78,8 +82,9 @@
       },
       wrapClass() {
         return {
-          'dao-numberic-input': true,
+          'dao-numeric-input': true,
           'with-unit': this.unit,
+          block: this.block,
         };
       },
       inputClass() {
@@ -186,5 +191,5 @@
   };
 </script>
 
-<style lang="scss" src="./dao-numberic-input.scss">
+<style lang="scss" src="./dao-numeric-input.scss">
 </style>

src/components/dao-input/index.js

@@ -1,6 +1,6 @@
 import daoInput from './dao-input.vue';
 import daoEditableInput from './dao-editable-input.vue';
 import daoFileInput from './dao-file-input.vue';
-import daoNumbericInput from './dao-numberic-input.vue';
+import daoNumericInput from './dao-numeric-input.vue';
 
-export { daoInput, daoEditableInput, daoFileInput, daoNumbericInput };
+export { daoInput, daoEditableInput, daoFileInput, daoNumericInput };

src/components/dao-panel/dao-panel.scss

@@ -9,7 +9,6 @@ $header-tab-border-color: #ccd1d9;
 .dao-panel {
     width: 100%;
     border: 1px solid $header-tab-border-color;
-    overflow: hidden;
     max-height: 100%;
     position: relative;
 }
@@ -80,4 +79,5 @@ $header-tab-border-color: #ccd1d9;
     top: 0;
     margin-top: -3px;
     cursor: row-resize;
+    user-select: none;
 }

src/components/dao-select/dao-option.vue

@@ -1,7 +1,7 @@
 <template>
   <div :class="['dao-option-item', {'disabled': disabled, 'active': active}]" @click="handleClick" v-show="matchedFilter">
     <svg class="icon checkmark">
-      <use xlink:href="#icon_checkmark"></use>
+      <use xlink:href="#icon_checkmark-menu-item"></use>
     </svg>
     <span>
       <slot>{{ label }}</slot>

src/components/dao-tooltip/dao-tooltip.scss

@@ -12,6 +12,8 @@ $tooltip-bg:               #000 !default;
   font-size: 13px;
   line-height: 22px;
   position: absolute;
+  // when position error, fixed tooltip twinkle
+  pointer-events: none;
 
   // Wrapper for the tooltip content
   .dao-tooltip-inner {

src/index.js

@@ -16,7 +16,7 @@ import daoClipboard from './components/dao-clipboard';
 import daoDialog from './components/dao-dialog';
 import daoDraggableComponent from './components/dao-draggable';
 import daoDropdown from './components/dao-dropdown';
-import { daoEditableInput, daoFileInput, daoNumbericInput, daoInput } from './components/dao-input';
+import { daoEditableInput, daoFileInput, daoNumericInput, daoInput } from './components/dao-input';
 import daoEditableList from './components/dao-editable-list';
 import daoEditableTable from './components/dao-editable-table';
 import daoInfoCard from './components/dao-info-card';
@@ -65,7 +65,7 @@ const daoStyleComponents = {
   daoInputWithLabel,
   daoList,
   daoNumericBadge,
-  daoNumbericInput,
+  daoNumericInput,
   daoOption: daoSelect.Option,
   daoOptionGroup: daoSelect.Group,
   daoPopover,

version.js

@@ -1,6 +1,6 @@
 /* eslint-disable */
 // this version shows current version of project
-var VERSION = '1.0.3';
+var VERSION = '1.0.4';
 module.exports = { VERSION: VERSION };
 // ’make release‘ 依赖 console.log 把打印到标准输出, 不可删除
 console.log(VERSION);