2.0.17 mutil-select 增加 isDeleteAble

wf123537200 · Jul 28, 2017 · d2d0229 · d2d0229
1 parent 7a5f657
commit d2d0229
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 20 deletions.
diff --git a/demo/multi-select/index.vue b/demo/multi-select/index.vue
@@ -39,20 +39,22 @@
                         }, {
                             value: 2,
                             label: 'value2disabledvalue2disabled',
-                            isDisabled: true
+                            isDisabled: true,
+                            isDeleteAble: false
                         }];
 
                         var other = [];
                         for(var i = 0; i < 30; i++) {
                             other.push({
                                 value: i,
-                                label: 'value' + i
+                                label: 'value' + i,
+                                isDeleteAble: false
                             })
                         }
 
                         return base.concat(other);
                     })(),
-                multiResList: [ { "value": 7, "label": "value7" }, { "value": 9, "label": "value9" }, { "value": 17, "label": "value17" }, { "value": 11, "label": "value11" }]
+                multiResList: [ { "value": 7, "label": "value7", isDeleteAble: false}, { "value": 9, "label": "value9" }, { "value": 17, "label": "value17" }, { "value": 11, "label": "value11" }]
             }
         },
         methods: {

diff --git a/dist/dropdown/index.js b/dist/dropdown/index.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/multi-select/index.js b/dist/multi-select/index.js
diff --git a/dist/pagination/index.js b/dist/pagination/index.js
diff --git a/dist/select/index.js b/dist/select/index.js
diff --git a/dist/split.js b/dist/split.js
diff --git a/dist/split.js.map b/dist/split.js.map
diff --git a/dist/table-edit/index.js b/dist/table-edit/index.js
diff --git a/dist/table/index.js b/dist/table/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vucc",
-  "version": "2.0.17",
+  "version": "2.0.18",
   "description": "vue 前端组件库",
   "main": "dist",
   "devDependencies": {

diff --git a/src/components/dropdown/index.vue b/src/components/dropdown/index.vue
@@ -17,6 +17,8 @@
         value: 2,
         label: 'value2',
         isDisabled: true
+        // 不可删除
+        isDeleteAble: false
       }]
     }
   @param {String} [size = normal | large | small] 组件大小,单选时使用
@@ -74,7 +76,7 @@
                 <ul>
                     <li v-for="it in resultListTemp">
                         <span class="vc-dropdown-multi-result-text" :title="it.label">{{it.label}}</span>
-                        <span class="vc-dropdown-multi-result-delete" @click.stop="onDelete(it)"></span>
+                        <span v-if="it.isDeleteAble !== false" class="vc-dropdown-multi-result-delete" @click.stop="onDelete(it)"></span>
                     </li>
                 </ul>
             </div><!-- 已选展示 end -->