Merge pull request '1.0.3版本修改时间选择器width,增加table操作列的tooltip显示' (#9) from zjl into develop
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: #9
This commit is contained in:
朱菊兰 2023-11-24 10:55:47 +08:00
commit f50b127314
4 changed files with 33 additions and 9 deletions

12
package-lock.json generated
View File

@ -4007,9 +4007,9 @@
} }
}, },
"node_modules/code-brick-zj": { "node_modules/code-brick-zj": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-1.0.2.tgz", "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-1.0.3.tgz",
"integrity": "sha512-V8XwYqXjIPMfPCaZMja4I2MJPT45EEnzRmTL1Ps6aMsmUQ/PhZ48OwUvddBFNqNZeVV13aPm1b5K1c3ogfad8Q==" "integrity": "sha512-7RG5c6/85mnLh+XG06dSWJHe+c3xITQ+OD4c9+0H+9tMTV+gwiEGlor8hbl0HsLk1KLB4ERDhcl5bdmRr7mU/Q=="
}, },
"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": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-1.0.2.tgz", "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-1.0.3.tgz",
"integrity": "sha512-V8XwYqXjIPMfPCaZMja4I2MJPT45EEnzRmTL1Ps6aMsmUQ/PhZ48OwUvddBFNqNZeVV13aPm1b5K1c3ogfad8Q==" "integrity": "sha512-7RG5c6/85mnLh+XG06dSWJHe+c3xITQ+OD4c9+0H+9tMTV+gwiEGlor8hbl0HsLk1KLB4ERDhcl5bdmRr7mU/Q=="
}, },
"color-convert": { "color-convert": {
"version": "1.9.3", "version": "1.9.3",

View File

@ -3,9 +3,20 @@
<p> <p>
组件包目前封装常用的四个组件:表格搜索区域分页对话框包npm地址为https://www.npmjs.com/package/code-brick-zj 组件包目前封装常用的四个组件:表格搜索区域分页对话框包npm地址为https://www.npmjs.com/package/code-brick-zj
</p> </p>
<p>文档当前使用的组件包的版本为1.0.2</p> <p>文档当前使用的组件包的版本为1.0.3</p>
<div class="block"> <div class="block">
<el-timeline> <el-timeline>
<el-timeline-item timestamp="2023/11/24" placement="top">
<el-card>
<h4>增加/修改</h4>
<h4>
表格增加表格操作列按钮的tooltip样式
设置showTip的值即可对当前按钮开启tooptip并显示showTip中的值
</h4>
<h4>时间选择器修改了默认的width尺寸</h4>
<p>组件版本号为1.0.3</p>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="2023/2/28" placement="top"> <el-timeline-item timestamp="2023/2/28" placement="top">
<el-card> <el-card>
<h4>修改</h4> <h4>修改</h4>

View File

@ -2,6 +2,10 @@
<div class="search-bar"> <div class="search-bar">
<div class="demo-box"> <div class="demo-box">
<h3>input输入框(size默认small高度是32px)</h3> <h3>input输入框(size默认small高度是32px)</h3>
<p>
部分业务需要输入框必填 可以设置required的值为true来显示红星
判断逻辑还是得在js中写required只是样式上显示红星
</p>
<div style="height: 50px"> <div style="height: 50px">
<SearchBar :formConfigs="formConfig1" /> <SearchBar :formConfigs="formConfig1" />
</div> </div>
@ -22,7 +26,8 @@
type: 'input', type: 'input',
label: '姓名', label: '姓名',
placeholder: 'width不传默认200px', placeholder: 'width不传默认200px',
param: 'xm1' param: 'xm1',
required: true
}, },
{ {
type: 'input', type: 'input',
@ -1144,7 +1149,8 @@ export default {
type: 'input', type: 'input',
label: '姓名', label: '姓名',
placeholder: 'width不传默认200px', placeholder: 'width不传默认200px',
param: 'xm1' param: 'xm1',
required: true
}, },
{ {
type: 'input', type: 'input',

View File

@ -519,6 +519,11 @@
详情--detail 编辑---edit 详情--detail 编辑---edit
删除---delete,以上三个是显示图标其他按钮显示中文字字图标按上述传自动加载图标 删除---delete,以上三个是显示图标其他按钮显示中文字字图标按上述传自动加载图标
</p> </p>
<p>
showTip:默认是禁用的如部分按钮文字过长需缩短文字又怕意思不清
可以加showTip来显示具体样式见 开始 按钮
showParam:是控制按钮能否被点击可以根据表格中的字段按规则来控制按钮
</p>
<base-table :table-props="tableProps" :table-data="tableData"> <base-table :table-props="tableProps" :table-data="tableData">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
@ -612,6 +617,7 @@
{ {
type: 'start', type: 'start',
btnName: '开始', btnName: '开始',
showTip: '开始生产',
showParam: { showParam: {
type: '&', type: '&',
data: [ data: [
@ -883,6 +889,7 @@ const tableBtn = [
{ {
type: 'start', type: 'start',
btnName: '开始', btnName: '开始',
showTip: '开始生产',
showParam: { showParam: {
type: '&', type: '&',
data: [ data: [