update

co-kevin · Mar 18, 2019 · b1c5e97 · b1c5e97
1 parent f7eb713
commit b1c5e97
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -95,6 +95,7 @@ edit-config 编辑参数配置
 | clearActiveMethod | 该函数 Function({type, row, rowIndex, column?, columnIndex?}) 的返回值用来决定是否允许清除当前活动行或单元格 | Function | — | — |
 | useDefaultValidTip | 如果同时使用了数据校验和 fixed 列，请设置为 true 使用默认提示  | Boolean | — | false |
 | validTooltip | 只对 useDefaultValidTip=false 有效，设置校验 tooltip 提示消息的参数 | Object | — | { offset: 10, placement: 'bottom-start' } |
+| disabledValidTip | 关闭校验提示 | Boolean | — | false |
 | autoScrollIntoView | 当单元格被激活时，自动将单元格滚动到可视区域内 | Boolean | — | false |
 | isTabKey | 只对 trigger!=manual 有效，是否启用 Tab 键切换到下一个单元格 | Boolean | — | false |
 | isArrowKey | 只对 trigger!=manual 有效，是否启用箭头键切换行和单元格 | Boolean | — | false |

diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/vue-element-extends/favicon.ico><title>ElementUI 2.X components extends.</title><link href=/vue-element-extends/static/css/chunk-vendors.e379f047.css rel=preload as=style><link href=/vue-element-extends/static/css/index.834cfc96.css rel=preload as=style><link href=/vue-element-extends/static/js/chunk-vendors.cff343aa.js rel=preload as=script><link href=/vue-element-extends/static/js/index.c7239359.js rel=preload as=script><link href=/vue-element-extends/static/css/chunk-vendors.e379f047.css rel=stylesheet><link href=/vue-element-extends/static/css/index.834cfc96.css rel=stylesheet></head><body><noscript><strong>We're sorry but test2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vue-element-extends/static/js/chunk-vendors.cff343aa.js></script><script src=/vue-element-extends/static/js/index.c7239359.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/vue-element-extends/favicon.ico><title>ElementUI 2.X components extends.</title><link href=/vue-element-extends/static/css/chunk-vendors.e379f047.css rel=preload as=style><link href=/vue-element-extends/static/css/index.834cfc96.css rel=preload as=style><link href=/vue-element-extends/static/js/chunk-vendors.cff343aa.js rel=preload as=script><link href=/vue-element-extends/static/js/index.f91fa35b.js rel=preload as=script><link href=/vue-element-extends/static/css/chunk-vendors.e379f047.css rel=stylesheet><link href=/vue-element-extends/static/css/index.834cfc96.css rel=stylesheet></head><body><noscript><strong>We're sorry but test2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vue-element-extends/static/js/chunk-vendors.cff343aa.js></script><script src=/vue-element-extends/static/js/index.f91fa35b.js></script></body></html>
diff --git a/docs/static/js/index.c7239359.js b/docs/static/js/index.c7239359.js
diff --git a/docs/static/js/index.f91fa35b.js b/docs/static/js/index.f91fa35b.js
diff --git a/examples/views/editable/Click1.vue b/examples/views/editable/Click1.vue
@@ -26,7 +26,7 @@
         </template>
       </el-editable-column>
       <template v-slot:append>
-        <div>-- append 插槽 --</div>
+        <div>-- slot append --</div>
       </template>
     </el-editable>
   </div>

diff --git a/examples/views/editable/Click10.vue b/examples/views/editable/Click10.vue
@@ -20,6 +20,7 @@
       :data.sync="list"
       :row-class-name="tableRowClassName"
       :edit-config="{trigger: 'click', mode: 'cell', activeMethod}"
+      @edit-disabled="editDisabledEvent"
       style="width: 100%">
       <el-editable-column type="selection" width="55"></el-editable-column>
       <el-editable-column prop="id" label="ID" width="80"></el-editable-column>
@@ -185,6 +186,12 @@ export default {
       }
       return ''
     },
+    editDisabledEvent (row, column, cell, event) {
+      Message({
+        type: 'error',
+        message: '该列禁止编辑！'
+      })
+    },
     insertEvent () {
       let row = this.$refs.editable.insert({
         name: `New ${Date.now()}`,

diff --git a/examples/views/editable/Click11.vue b/examples/views/editable/Click11.vue
@@ -19,6 +19,12 @@
       style="width: 100%">
       <el-editable-column type="selection" width="55"></el-editable-column>
       <el-editable-column width="40">
+        <template v-slot:header="scope">
+          <el-tooltip class="item" placement="top">
+            <div slot="content">按住后可以上下拖动排序，<br>完成后点击保存即可！</div>
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+        </template>
         <template>
           <i class="fa fa-arrows drag-btn"></i>
         </template>

diff --git a/examples/views/editable/Click9.vue b/examples/views/editable/Click9.vue
@@ -1,5 +1,6 @@
 <template>
   <div v-loading="loading">
+    <p style="color: red;font-size: 12px;">设置 disabledValidTip=true 关闭校验提示</p>
     <p style="color: red;font-size: 12px;">name字段（校验必填，校验3-50个字符）nickname字段（校验5-20个字符）sex字段（校验必填，校验手机号码）age字段（校验必填，自定义校验，18-60之间）phone字段（校验必填，校验手机号码）rate字段（校验必填，校验最少选中2颗星）url（校验必填，校验URL路径）attr1（校验数字）attr2（校验整数）attr3（校验小数）</p>
 
     <el-form ref="tableform" class="click-table9-form" size="mini" :inline="true" :model="formData">
@@ -38,7 +39,8 @@
       :data.sync="list"
       :row-class-name="tableRowClassName"
       :edit-rules="validRules"
-      :edit-config="{trigger: 'click', mode: 'cell', useDefaultValidTip: true}"
+      :edit-config="{trigger: 'click', mode: 'cell', disabledValidTip: true}"
+      @valid-error="validErrorEvent"
       style="width: 100%">
       <el-editable-column type="selection" width="55"></el-editable-column>
       <el-editable-column prop="id" label="ID" width="80"></el-editable-column>
@@ -230,6 +232,12 @@ export default {
       }
       return ''
     },
+    validErrorEvent (rule, row, column, cell) {
+      Message({
+        type: 'error',
+        message: rule.message
+      })
+    },
     insertEvent () {
       let row = this.$refs.editable.insert({
         age: 26,

diff --git a/examples/views/editable/Dblclick1.vue b/examples/views/editable/Dblclick1.vue
@@ -27,7 +27,7 @@
         </template>
       </el-editable-column>
       <template v-slot:append>
-        <div>-- append 插槽 --</div>
+        <div>-- slot append --</div>
       </template>
     </el-editable>
   </div>

diff --git a/examples/views/editable/Dblclick5.vue b/examples/views/editable/Dblclick5.vue
@@ -56,7 +56,7 @@
           <el-editable-column v-else-if="item.prop === 'attr1'" :key="index" v-bind="item" :edit-render="{name: 'ElInput'}">
             <template v-slot:header="scope">
               <i class="editable-required-icon"></i>
-              {{ scope.column.label }}
+              -- slot header -- {{ scope.column.label }}
               <el-tooltip class="item" placement="top">
                 <div slot="content">说明：<br>attr1字段为自定义列头<br>校验必填字段</div>
                 <i class="el-icon-question"></i>
@@ -65,8 +65,8 @@
           </el-editable-column>
           <el-editable-column v-else-if="item.prop === 'attr2'" :key="index" v-bind="item" :edit-render="{name: 'ElInput'}">
             <template v-slot:header="scope">
-              自定义列头2
-              <el-tooltip class="item" content="说明：attr2字段为自定义列头" placement="top">
+              -- slot header --
+              <el-tooltip class="item" content="说明：attr2字段为自定义列头" placement="left" effect="light">
                 <i class="el-icon-warning"></i>
               </el-tooltip>
             </template>

diff --git a/examples/views/editable/Manual1.vue b/examples/views/editable/Manual1.vue
@@ -33,7 +33,7 @@
         </template>
       </el-editable-column>
       <template v-slot:append>
-        <div>-- append 插槽 --</div>
+        <div>-- slot append --</div>
       </template>
     </el-editable>
   </div>

diff --git a/examples/views/editable/Manual3.vue b/examples/views/editable/Manual3.vue
@@ -47,7 +47,7 @@
         </template>
       </el-editable-column>
       <template v-slot:append>
-        <div>-- append 插槽 --</div>
+        <div>-- slot append --</div>
       </template>
     </el-editable>
 

diff --git a/packages/editable/src/editable-column.vue b/packages/editable/src/editable-column.vue
@@ -48,7 +48,7 @@
       <template v-else>
         <slot v-bind="getRowScope(scope)">{{ formatColumnLabel(scope) }}</slot>
       </template>
-      <template v-if="scope.row.validActive && scope.row.validActive === scope.column.property">
+      <template v-if="scope.row.validActive && !scope.row.config.disabledValidTip && scope.row.validActive === scope.column.property">
         <template v-if="scope.row.config.useDefaultValidTip">
           <template v-if="scope.row.showValidMsg">
             <slot name="valid" v-bind="getVaildScope(scope)">
@@ -58,7 +58,7 @@
             </slot>
           </template>
         </template>
-        <template v-else-if="!scope.row.config.validTooltip.disabled">
+        <template v-else>
           <el-tooltip :value="scope.row.showValidMsg" v-bind="scope.row.config.validTooltip">
             <div class="editable-valid_wrapper"></div>
             <template v-slot:content>

diff --git a/packages/editable/src/editable.vue b/packages/editable/src/editable.vue
@@ -136,6 +136,8 @@ export default {
         mode: 'cell',
         // 是否使用默认的 tip 校验提示框，如果同时使用了数据校验和 fixed 列，建议设置为 true，否则会出现多个 tip 提示（因为隐藏的 fixed 列部分也会被渲染，所以会导致同时出现多个校验提示）
         useDefaultValidTip: false,
+        // 是否关闭校验提示
+        disabledValidTip: false,
         // 当点击其它地方后，自动清除最后活动行或列
         autoClearActive: true,
         // 当单元格被激活时，自动将单元格滚动到可视区域内
@@ -264,6 +266,7 @@ export default {
           mode: this.configs.mode,
           useDefaultValidTip: this.configs.useDefaultValidTip,
           validTooltip: this.configs.validTooltip,
+          disabledValidTip: this.configs.disabledValidTip,
           rules: this.editRules
         }
       }