Compare commits

...

6 Commits

Author SHA1 Message Date
746654cd71 更新组件,更新主题包 2023-01-06 11:05:27 +08:00
67dd6b0760 Merge pull request '增加table单选的受控事件' (#3) from zjl into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #3
2022-12-26 19:26:18 +08:00
7aa6375f22 Merge pull request 'fix: :修正构建触发分支' (#2) from cicd into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #2
2022-12-16 15:15:49 +08:00
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
8ff16edec0 build: :新增自动构建部署 2022-12-16 15:01:54 +08:00
7 changed files with 64 additions and 13 deletions

41
.drone.yml Normal file
View File

@ -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

10
Dockerfile Normal file
View File

@ -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

14
package-lock.json generated
View File

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

View File

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

View File

@ -3,7 +3,7 @@
<p> <p>
组件包目前封装常用的四个组件:表格搜索区域分页对话框包npm地址为https://www.npmjs.com/package/code-brick-zj 组件包目前封装常用的四个组件:表格搜索区域分页对话框包npm地址为https://www.npmjs.com/package/code-brick-zj
</p> </p>
<p>文档当前使用的组件包的版本为0.0.3</p> <p>文档当前使用的组件包的版本为0.0.5</p>
</div> </div>
</template> </template>
<script> <script>

View File

@ -100,7 +100,7 @@
stripe stripe
:page="1" :page="1"
:limit="20" :limit="20"
border :cancel-border="true"
/> />
<el-collapse> <el-collapse>
<el-collapse-item title="显示代码"> <el-collapse-item title="显示代码">
@ -108,7 +108,7 @@
<code>stripe</code>属性可以创建带斑马纹的表格它接受一个 <code>stripe</code>属性可以创建带斑马纹的表格它接受一个
<code>Boolean</code>默认为<code>false</code> <code>Boolean</code>默认为<code>false</code>
设置为<code>true</code>即为启用默认情况下Table 设置为<code>true</code>即为启用默认情况下Table
组件是不具有竖直方向的边框的如果需要可以使用<code>border</code>属性它接受一个<code>Boolean</code>设置为<code>true</code>即可启用 组件是有竖直方向的边框的如果需要取消可以使用<code>cancel-border</code>属性它接受一个<code>Boolean</code>设置为<code>true</code>即可取消边框
</div> </div>
<div> <div>
<pre> <pre>
@ -119,7 +119,7 @@
:limit="20" :limit="20"
:table-data="tableData" :table-data="tableData"
stripe stripe
border :cancel-border="true"
/&gt; /&gt;
&lt;<span>/template</span>&gt; &lt;<span>/template</span>&gt;
</pre> </pre>

File diff suppressed because one or more lines are too long