update

x-extends · Jun 12, 2019 · 9cb723d · 9cb723d
1 parent dc10001
commit 9cb723d
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 31 deletions.
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=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><link rel=icon href=/vxe-table/favicon.ico><title>vxe-table 表格</title><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=preload as=style><link href=/vxe-table/static/css/index.1473577d.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.9d232144.js rel=preload as=script><link href=/vxe-table/static/js/index.518319e1.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=stylesheet><link href=/vxe-table/static/css/index.1473577d.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/static/js/chunk-vendors.9d232144.js></script><script src=/vxe-table/static/js/index.518319e1.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><link rel=icon href=/vxe-table/favicon.ico><title>vxe-table 表格</title><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=preload as=style><link href=/vxe-table/static/css/index.3e4ac245.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.9d232144.js rel=preload as=script><link href=/vxe-table/static/js/index.ff6acf77.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=stylesheet><link href=/vxe-table/static/css/index.3e4ac245.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/static/js/chunk-vendors.9d232144.js></script><script src=/vxe-table/static/js/index.ff6acf77.js></script></body></html>
diff --git a/docs/static/css/index.1473577d.css b/docs/static/css/index.1473577d.css
diff --git a/docs/static/css/index.3e4ac245.css b/docs/static/css/index.3e4ac245.css
diff --git a/docs/static/js/index.518319e1.js b/docs/static/js/index.518319e1.js
diff --git a/docs/static/js/index.ff6acf77.js b/docs/static/js/index.ff6acf77.js
diff --git a/examples/assets/style/layout.scss b/examples/assets/style/layout.scss
@@ -19,6 +19,9 @@ body {
     font-size: 14px;
   }
 }
+.red {
+  color: red;
+}
 
 .page-header {
   max-width: 1400px;

diff --git a/examples/views/table/advanced/Page.vue b/examples/views/table/advanced/Page.vue
@@ -3,6 +3,7 @@
     <p>使用自带的分页 <pager-api-link name="vxe-pager"/></p>
     <p>对于分页场景下，如果现有序号递增，可以通过 <table-api-link prop="start-index"/> 属性设置起始值</p>
     <p>对于分页场景下，如果想要保留选中状态，可以通过设置 <table-api-link prop="select-config"/> 的 <table-api-link prop="reserve"/> 属性</p>
+    <p class="red">设置 reserve 需要指定 <table-api-link prop="row-key"/> 或者 ( <table-api-link prop="select-config"/>、<table-api-link prop="tree-config"/>、<table-api-link prop="expand-config"/>、<table-api-link prop="edit-config"/> ) 中的 key 任意配置一个即可</p>
 
     <vxe-table
       border
@@ -56,29 +57,32 @@ export default {
       },
       demoCodes: [
         `
-          <vxe-table
-            border
-            show-all-overflow
-            ref="xTable"
-            height="460"
-            :loading="loading"
-            :data.sync="tableData">
-            <vxe-table-column type="index" width="60"></vxe-table-column>
-            <vxe-table-column prop="name" label="Name" sortable></vxe-table-column>
-            <vxe-table-column prop="sex" label="Sex"></vxe-table-column>
-            <vxe-table-column prop="age" label="Age"></vxe-table-column>
-            <vxe-table-column prop="rate" label="Rate"></vxe-table-column>
-          </vxe-table>
+        <vxe-table
+          border
+          show-all-overflow
+          ref="xTable"
+          height="460"
+          :loading="loading"
+          :start-index="(tablePage.currentPage - 1) * tablePage.pageSize"
+          :select-config="{key: 'id', reserve: true}"
+          :data.sync="tableData">
+          <vxe-table-column type="selection" width="60"></vxe-table-column>
+          <vxe-table-column type="index" label="序号" width="60"></vxe-table-column>
+          <vxe-table-column prop="name" label="Name" sortable></vxe-table-column>
+          <vxe-table-column prop="sex" label="Sex"></vxe-table-column>
+          <vxe-table-column prop="age" label="Age"></vxe-table-column>
+          <vxe-table-column prop="rate" label="Rate"></vxe-table-column>
+        </vxe-table>
 
-          <vxe-pager
-            :loading="loading"
-            :current-page="tablePage.currentPage"
-            :page-size="tablePage.pageSize"
-            :total="tablePage.totalResult"
-            :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange">
-          </vxe-pager>
+        <vxe-pager
+          :loading="loading"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.totalResult"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange">
+        </vxe-pager>
         `,
         `
         export default {

diff --git a/examples/views/table/edit/AutoClear.vue b/examples/views/table/edit/AutoClear.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p>设置 <table-api-link prop="edit-config"/>={key: 'id', trigger: 'manual', mode: 'row', <table-api-link prop="autoClear"/>: false}，还可以通过设置 <table-api-link prop="autoClear"/> 关闭默认的单元格清除激活行为</p>
+    <p>设置 <table-api-link prop="edit-config"/>={key: 'id', trigger: 'manual', mode: 'row', autoClear: false}，还可以通过设置 <table-api-link prop="autoClear"/> 关闭默认的单元格清除激活行为</p>
 
     <vxe-table
       ref="xTable"

diff --git a/examples/views/table/edit/Click.vue b/examples/views/table/edit/Click.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
-    <p>设置 <table-api-link prop="edit-config"/>={key: 'id', trigger: 'click', mode: 'cell'} 启用单元格点击编辑的功能（必须指定 <table-api-link prop="row-key"/> 或 key）</p>
+    <p>设置 <table-api-link prop="edit-config"/>={key: 'id', trigger: 'click', mode: 'cell'} 启用单元格点击编辑的功能</p>
+    <p class="red">必须指定 <table-api-link prop="row-key"/> 或者 ( <table-api-link prop="select-config"/>、<table-api-link prop="tree-config"/>、<table-api-link prop="expand-config"/>、<table-api-link prop="edit-config"/> ) 中的 key 任意配置一个即可</p>
 
     <vxe-table
       border

diff --git a/examples/views/table/edit/DBLClick.vue b/examples/views/table/edit/DBLClick.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
-    <p>设置 <table-api-link prop="edit-config"/>={key: 'id', trigger: 'dblclick', mode: 'cell'} 启用单元格双击编辑的功能（必须指定 rowKey 或 key）</p>
+    <p>设置 <table-api-link prop="edit-config"/>={key: 'id', trigger: 'dblclick', mode: 'cell'} 启用单元格双击编辑的功能</p>
+    <p class="red">必须指定 <table-api-link prop="row-key"/> 或者 ( <table-api-link prop="select-config"/>、<table-api-link prop="tree-config"/>、<table-api-link prop="expand-config"/>、<table-api-link prop="edit-config"/> ) 中的 key 任意配置一个即可</p>
 
     <vxe-table
       border

diff --git a/examples/views/table/edit/Manual.vue b/examples/views/table/edit/Manual.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
-    <p>设置 <table-api-link prop="edit-config"/>={key: 'id', trigger: 'manual', mode: 'row'} 启用行编辑的功能（必须指定 rowKey 或 key）</p>
+    <p>设置 <table-api-link prop="edit-config"/>={key: 'id', trigger: 'manual', mode: 'row'} 启用行编辑的功能</p>
+    <p class="red">必须指定 <table-api-link prop="row-key"/> 或者 ( <table-api-link prop="select-config"/>、<table-api-link prop="tree-config"/>、<table-api-link prop="expand-config"/>、<table-api-link prop="edit-config"/> ) 中的 key 任意配置一个即可</p>
 
     <vxe-table
       ref="xTable"

diff --git a/examples/views/table/excel/Cell.vue b/examples/views/table/excel/Cell.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <p>使用 vxe-excel 渲染 Excel 表格</p>
-    <p style="color: red;">注意：暂时只能支持少量数据，不建议使用（重构中...）</p>
+    <p class="red">注意：暂时只能支持少量数据，不建议使用（重构中...）</p>
 
     <vxe-toolbar>
       <template v-slot:buttons>

diff --git a/examples/views/table/tree/Toolbar.vue b/examples/views/table/tree/Toolbar.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
-    <p>增删改查、工具栏，如果 key 值一样的情况下（<table-api-link prop="row-key"/>、<table-api-link prop="select-config"/>、<table-api-link prop="tree-config"/>、<table-api-link prop="edit-config"/> 的 key 任意配置一个即可）</p>
+    <p>增删改查、工具栏</p>
+    <p class="red">必须指定 <table-api-link prop="row-key"/> 或者 ( <table-api-link prop="select-config"/>、<table-api-link prop="tree-config"/>、<table-api-link prop="expand-config"/>、<table-api-link prop="edit-config"/> ) 中的 key 任意配置一个即可</p>
 
     <vxe-toolbar :data="tableData" setting>
       <template v-slot:buttons>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><link rel=icon href=/vxe-table/favicon.ico><title>vxe-table 表格</title><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=preload as=style><link href=/vxe-table/static/css/index.1473577d.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.9d232144.js rel=preload as=script><link href=/vxe-table/static/js/index.518319e1.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=stylesheet><link href=/vxe-table/static/css/index.1473577d.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/static/js/chunk-vendors.9d232144.js></script><script src=/vxe-table/static/js/index.518319e1.js></script></body></html>
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><link rel=icon href=/vxe-table/favicon.ico><title>vxe-table 表格</title><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=preload as=style><link href=/vxe-table/static/css/index.3e4ac245.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.9d232144.js rel=preload as=script><link href=/vxe-table/static/js/index.ff6acf77.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=stylesheet><link href=/vxe-table/static/css/index.3e4ac245.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/static/js/chunk-vendors.9d232144.js></script><script src=/vxe-table/static/js/index.ff6acf77.js></script></body></html>