Merge pull request '增加table单选的受控事件' (#3) from zjl into develop

Reviewed-on: #3

.drone.yml

@@ -0,0 +1,41 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: build
+  image: docker:dind
+  volumes:
+  - name: dockersock
+    path: /var/run/docker.sock
+  - name: dockerconfig
+    path: /root/.docker
+  commands:
+  - docker build --add-host github.com:192.30.255.113 -t harbor.picaiba.com/kszny/cnbmai:1.0.0 ./ && docker push harbor.picaiba.com/kszny/cnbmai:1.0.0
+
+- name: deploy
+  image: harbor.picaiba.com/tools/kubectl:1.19.8
+  commands:
+  - echo "172.27.0.20 lb.kubesphere.local" >> /etc/hosts
+  #- echo "52.74.223.119 github.com" >> /etc/hosts
+  - sleep 1
+  - kubectl scale --replicas=0 deployment/cnbmai -n cnbmai
+  - sleep 3
+  - kubectl scale --replicas=1 deployment/cnbmai -n cnbmai
+  depends_on:
+  - build
+
+volumes:
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: dockerconfig
+  host:
+    path: /root/.docker
+
+trigger:
+  branch:
+  - develop
+  event:
+  - push

Dockerfile

@@ -0,0 +1,10 @@
+FROM node:12 AS builder
+WORKDIR /app
+ADD package.json /app/
+RUN npm config set registry https://registry.npmmirror.com && npm install 
+ADD . /app
+RUN npm run build
+
+FROM busybox
+LABEL maintainer thomas.hairong@gmail.com
+COPY --from=builder /app/dist /html

package-lock.json

@@ -8,7 +8,7 @@
       "name": "code-brick-wd",
       "version": "0.1.0",
       "dependencies": {
-        "code-brick-zj": "^0.0.1",
+        "code-brick-zj": "^0.0.4",
         "core-js": "^3.8.3",
         "element-ui": "^2.15.12",
         "vue": "^2.6.14",
@@ -4007,9 +4007,9 @@
       }
     },
     "node_modules/code-brick-zj": {
-      "version": "0.0.1",
+      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.4.tgz",
-      "integrity": "sha512-XLvQEoiVWESDirkMKVKCIdH1jW3drkSS472uMWd1m6Ul5UVTUAiJvBQ15kEo+L7w8Zt7cC5ErF+laYHhNeoaIA=="
+      "integrity": "sha512-KSQ/drfIpoZKTrcARtuwG+6olde7fBYl+38Kialqa1NSoSDhPMqXTVw2N4KfA4MlucXQ/s3KZjfUsmKVZ70KkA=="
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
@@ -14473,9 +14473,9 @@
       }
     },
     "code-brick-zj": {
-      "version": "0.0.1",
+      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.4.tgz",
-      "integrity": "sha512-XLvQEoiVWESDirkMKVKCIdH1jW3drkSS472uMWd1m6Ul5UVTUAiJvBQ15kEo+L7w8Zt7cC5ErF+laYHhNeoaIA=="
+      "integrity": "sha512-KSQ/drfIpoZKTrcARtuwG+6olde7fBYl+38Kialqa1NSoSDhPMqXTVw2N4KfA4MlucXQ/s3KZjfUsmKVZ70KkA=="
     },
     "color-convert": {
       "version": "1.9.3",

package.json

@@ -8,7 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "code-brick-zj": "^0.0.1",
+    "code-brick-zj": "^0.0.4",
     "core-js": "^3.8.3",
     "element-ui": "^2.15.12",
     "vue": "^2.6.14",

src/views/table/singleHead.vue

@@ -318,7 +318,11 @@
     </div>
     <div class="demo-box">
       <h3>单选</h3>
+      <el-button size="small" @click="setCurrent(1)">选中第二行</el-button>
+      <el-button size="small" @click="setCurrent(-1)">取消选中</el-button>
       <base-table
+        ref="palletTable1"
+        id="palletTable"
         :table-props="tableProps"
         :table-data="tableData"
         :page="1"
@@ -332,11 +336,16 @@
             Table
             组件提供了单选的支持，只需要配置<code>highlight-current-row</code>属性即可实现单选。
             之后由<code>current-change</code>事件来管理选中时触发的事件，它会传入<code>currentRow</code>，<code>oldCurrentRow</code>。
+            使用按钮选中取消，必须要传id,id的值是唯一的，id的值需要和<code>setCurrent</code>中第一参数一样。
           </div>
           <div>
             <pre>
+              &lt;el-button size="small" @click="setCurrent(1)"&gt;选中第二行&lt;/el-button&gt;
+              &lt;el-button size="small" @click="setCurrent(-1)"&gt;取消选中&lt;/el-button&gt;
               &lt;<span>template</span>&gt;
                 &lt;base-table
+                  ref="palletTable1"
+                  id="palletTable"
                   :table-props="tableProps"
                   :table-data="tableData"
                   :page="1"
@@ -345,6 +354,10 @@
                   @current-change="handleCurrentChange"
                 /&gt;
               &lt;<span>/template</span>&gt;
+              methods:
+              setCurrent(index) {
+                this.$refs.palletTable1.setCurrent('palletTable', index)
+              }
             </pre>
           </div>
         </el-collapse-item>
@@ -1168,8 +1181,8 @@ export default {
       }
       return ''
     },
-    setCurrent(row) {
+    setCurrent(index) {
-      this.$refs.singleTable.setCurrentRow(this.tableData[row])
+      this.$refs.palletTable1.setCurrent('palletTable', index)
     },
     handleCurrentChange(val) {
       console.log(val)