Merge pull request 'zjl' (#6 ) from zjl into develop

Reviewed-on: #6
首页增加更新记录&搜索区域增加竖线，根据2023.1.6日UI图
2023-01-10 14:09:32 +08:00 · 2023-01-10 14:08:19 +08:00 · 2023-01-10 09:58:18 +08:00 · 2023-01-09 16:43:20 +08:00 · 2023-01-09 16:42:31 +08:00 · 2023-01-06 11:06:29 +08:00
9 changed files with 179 additions and 19 deletions
--- a/.drone.yml
+++ b/.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
--- a/10
+++ b/10
@@ -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
--- a/package-lock.json
+++ b/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.7",
        "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",
-      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.1.tgz",
-      "integrity": "sha512-XLvQEoiVWESDirkMKVKCIdH1jW3drkSS472uMWd1m6Ul5UVTUAiJvBQ15kEo+L7w8Zt7cC5ErF+laYHhNeoaIA=="
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.7.tgz",
+      "integrity": "sha512-ZuhseY/9RUUUweAiTdumq5pJKAKAJxpvD8yjcVluY+cGDEKyoKzN9PjycPh2tUsE/gmwShfgrcIcm5DKcmzqvA=="
    },
    "node_modules/color-convert": {
      "version": "1.9.3",
@@ -14473,9 +14473,9 @@
      }
    },
    "code-brick-zj": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.1.tgz",
-      "integrity": "sha512-XLvQEoiVWESDirkMKVKCIdH1jW3drkSS472uMWd1m6Ul5UVTUAiJvBQ15kEo+L7w8Zt7cC5ErF+laYHhNeoaIA=="
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.7.tgz",
+      "integrity": "sha512-ZuhseY/9RUUUweAiTdumq5pJKAKAJxpvD8yjcVluY+cGDEKyoKzN9PjycPh2tUsE/gmwShfgrcIcm5DKcmzqvA=="
    },
    "color-convert": {
      "version": "1.9.3",
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
    "lint": "vue-cli-service lint"
  },
  "dependencies": {
-    "code-brick-zj": "^0.0.1",
+    "code-brick-zj": "^0.0.7",
    "core-js": "^3.8.3",
    "element-ui": "^2.15.12",
    "vue": "^2.6.14",
--- a/src/views/home/introduce.vue
+++ b/src/views/home/introduce.vue
@@ -3,7 +3,36 @@
    <p>
      组件包目前封装常用的四个组件:表格，搜索区域，分页，对话框。包npm地址为：https://www.npmjs.com/package/code-brick-zj。
    </p>
-    <p>文档当前使用的组件包的版本为：0.0.3</p>
+    <p>文档当前使用的组件包的版本为：0.0.7</p>
+    <div class="block">
+      <el-timeline>
+        <el-timeline-item timestamp="2023/1/10" placement="top">
+          <el-card>
+            <h4>修改</h4>
+            <h4>搜索区域UI样式更新,按2023.1.16的样式修改</h4>
+            <p>组件版本号为：0.0.7</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2023/1/9" placement="top">
+          <el-card>
+            <h4>修改</h4>
+            <h4>
+              1.table的序号列默认左侧固定，提供cancelPageFixed可以取消固定。
+            </h4>
+            <h4>2.提供方法doLayout，具体见文档基础表格下说明。</h4>
+            <p>组件版本号为：0.0.6</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2023/1/6" placement="top">
+          <el-card>
+            <h4>修改</h4>
+            <h4>1.table改成默认有border的，需要无border的table另外传参数。</h4>
+            <h4>2.css修改，适配没有sass-loader的项目</h4>
+            <p>组件版本号为：0.0.5</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </div>
  </div>
 </template>
 <script>
--- a/src/views/searchBar/searchBar.vue
+++ b/src/views/searchBar/searchBar.vue
@@ -589,6 +589,9 @@
                        btnName: '重置',
                        name: 'reset'
                      },
+                      {
+                        type: 'separate'
+                      },
                      {
                        type: 'button',
                        btnName: '打印',
@@ -1318,6 +1321,16 @@ export default {
          endPlaceholder: '结束时间',
          defaultSelect: ['2022-08-11', '2022-08-12'],
          param: 'searchTime4'
+        },
+        {
+          type: 'datePicker',
+          label: '产品上片时间',
+          dateType: 'datetime',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          placeholder: '产品上片时间',
+          param: 'testTime',
+          width: 200
        }
      ],
      formConfig33: [
@@ -1443,6 +1456,9 @@ export default {
          btnName: '重置',
          name: 'reset'
        },
+        {
+          type: 'separate'
+        },
        {
          type: 'button',
          btnName: '打印',
@@ -1454,7 +1470,8 @@ export default {
          type: 'button',
          btnName: '成功',
          name: 'success',
-          color: 'success'
+          color: 'success',
+          plain: true
        },
        {
          type: 'button',
--- a/src/views/table/canBeEntered.vue
+++ b/src/views/table/canBeEntered.vue
@@ -4,7 +4,6 @@
    <div class="demo-box">
      <h3>表格内嵌输入框</h3>
      <base-table
-        border
        :table-props="tableProps"
        :table-data="tableData"
        @emitFun="inputChange"
@@ -26,6 +25,7 @@
                /&gt;
              &lt;<span>/template</span>&gt;
              &lt;script&gt;
+              import inputArea from './components/InputArea.vue'
              const tableProps = [
                {
                  prop: 'testItems',
@@ -101,6 +101,44 @@
                }
              }
              &lt;/script&gt;
+              inputArea 参考代码：
+              &lt;template&gt;
+                &lt;div class="tableInner"&gt;
+                  &lt;el-input v-model="list[itemProp]" @blur="changeInput" /&gt;
+                &lt;/div&gt;
+              &lt;/template&gt;
+              &lt;script&gt;
+              export default {
+                name: 'InputArea',
+                props: {
+                  injectData: {
+                    type: Object,
+                    default: () => ({})
+                  },
+                  itemProp: {
+                    type: String
+                  }
+                },
+                data() {
+                  return {
+                    list: this.injectData
+                  }
+                },
+                methods: {
+                  changeInput() {
+                    console.log(this.list)
+                    this.$emit('emitData', this.list)
+                  }
+                }
+              }
+              &lt;/script&gt;
+              &lt;style scoped&gt;
+              .tableInner .el-input__inner {
+                border: none;
+                padding: 0;
+                height: 33px;
+              }
+              &lt;/style&gt;
            </pre>
          </div>
        </el-collapse-item>
@@ -109,7 +147,6 @@
    <div class="demo-box">
      <h3>表格底部新增按钮</h3>
      <base-table
-        border
        :table-props="tableProps2"
        :table-data="tableData2"
        :add-button-show="addButtonShow"
@@ -134,6 +171,7 @@
                /&gt;
              &lt;<span>/template</span>&gt;
              &lt;script&gt;
+              import inputArea from './components/InputArea.vue'
              const tableProps = [
                {
                  prop: 'testItems',
--- a/src/views/table/singleHead.vue
+++ b/src/views/table/singleHead.vue
@@ -17,11 +17,18 @@
            第一列的图标可以控制表格列的显示和隐藏。序号列的宽度可以自定义，默认为70，参数为<code>pageWidth</code>,类型为<code
              >Number</code
            >
+            。默认序号列是左侧固定的，如果需要取消固定可以传入参数<code>cancelPageFixed</code>值为<code>true</code>，elementUI提供了<code>doLayout</code>函数，对
+            Table 进行重新布局。当 Table
+            或其祖先元素由隐藏切换为显示时，可能需要调用此方法，具体用法如下demo。<code
+              >cancelPageFixed</code
+            ><code>doLayout</code>函数在组件code-brick-zj0.0.6版本支持。
          </div>
          <div>
            <pre>
              &lt;<span>template</span>&gt;
                &lt;base-table
+                  ref="baseTable1"
+                  id="baseTable"
                  :table-props="tableProps"
                  :page="1"
                  :limit="20"
@@ -85,6 +92,11 @@
                    }]
                  }
                }
+              },
+              methods: {
+                doLayout() {
+                  this.$refs.baseTable1.doLayout('baseTable')
+                }
              }
              &lt;/script&gt;
            </pre>
@@ -93,14 +105,14 @@
      </el-collapse>
    </div>
    <div class="demo-box">
-      <h3>带边框和斑马纹表格</h3>
+      <h3>不带边框和带斑马纹表格</h3>
      <base-table
        :table-props="tableProps"
        :table-data="tableData"
        stripe
        :page="1"
        :limit="20"
-        border
+        :cancel-border="true"
      />
      <el-collapse>
        <el-collapse-item title="显示代码">
@@ -108,7 +120,7 @@
            <code>stripe</code>属性可以创建带斑马纹的表格。它接受一个
            <code>Boolean</code>，默认为<code>false</code>，
            设置为<code>true</code>即为启用。默认情况下，Table
-            组件是不具有竖直方向的边框的，如果需要，可以使用<code>border</code>属性，它接受一个<code>Boolean</code>，设置为<code>true</code>即可启用。
+            组件是有竖直方向的边框的，如果需要取消，可以使用<code>cancel-border</code>属性，它接受一个<code>Boolean</code>，设置为<code>true</code>即可取消边框，<code>cancel-border</code>属性在组件code-brick-zj0.0.5版本支持。
          </div>
          <div>
            <pre>
@@ -119,7 +131,7 @@
                  :limit="20"
                  :table-data="tableData"
                  stripe
-                  border
+                  :cancel-border="true"
                /&gt;
              &lt;<span>/template</span>&gt;
            </pre>
@@ -318,7 +330,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 +348,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 +366,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 +1193,8 @@ export default {
      }
      return ''
    },
-    setCurrent(row) {
-      this.$refs.singleTable.setCurrentRow(this.tableData[row])
+    setCurrent(index) {
+      this.$refs.palletTable1.setCurrent('palletTable', index)
    },
    handleCurrentChange(val) {
      console.log(val)
--- a/theme/index.css
+++ b/theme/index.css
Author	SHA1	Message	Date
juzi	f13e13965c	Merge pull request 'zjl' (#6 ) from zjl into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #6	2023-01-10 14:09:32 +08:00
juzi	5e049769a2	首页增加更新记录&搜索区域增加竖线，根据2023.1.6日UI图	2023-01-10 14:08:19 +08:00
juzi	c2e01563fc	部分说明补充版本信息	2023-01-10 09:58:18 +08:00
juzi	0ba9afb5c6	Merge pull request '勘误&table增加doLayout事件文档' (#5 ) from zjl into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #5	2023-01-09 16:43:20 +08:00
juzi	b063d60279	勘误&table增加doLayout事件文档	2023-01-09 16:42:31 +08:00
juzi	069e33de40	Merge pull request '更新组件，更新主题包' (#4 ) from zjl into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #4	2023-01-06 11:06:29 +08:00
juzi	746654cd71	更新组件，更新主题包	2023-01-06 11:05:27 +08:00
juzi	67dd6b0760	Merge pull request '增加table单选的受控事件' (#3 ) from zjl into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #3	2022-12-26 19:26:18 +08:00
juzi	d46bf70433	增加table单选的受控事件	2022-12-26 19:23:54 +08:00
施海荣	7aa6375f22	Merge pull request 'fix: :修正构建触发分支' (#2 ) from cicd into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #2	2022-12-16 15:15:49 +08:00
thomas	565940ea8b	fix: :修正构建触发分支	2022-12-16 15:15:06 +08:00
施海荣	d654c05b46	Merge pull request 'build: :新增自动构建部署' (#1 ) from cicd into develop Reviewed-on: #1	2022-12-16 15:07:02 +08:00
thomas	8ff16edec0	build: :新增自动构建部署	2022-12-16 15:01:54 +08:00