Sfoglia il codice sorgente

Merge pull request '1.0.3版本修改时间选择器width,增加table操作列的tooltip显示' (#9) from zjl into develop

Reviewed-on: http://git.picaiba.com/mt-fe-group/cnbmai-ui-doc/pulls/9
develop
juzi 10 mesi fa
parent
commit
f50b127314
4 ha cambiato i file con 33 aggiunte e 9 eliminazioni
  1. +6
    -6
      package-lock.json
  2. +12
    -1
      src/views/home/introduce.vue
  3. +8
    -2
      src/views/searchBar/searchBar.vue
  4. +7
    -0
      src/views/table/singleHead.vue

+ 6
- 6
package-lock.json Vedi File

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


+ 12
- 1
src/views/home/introduce.vue Vedi File

@@ -3,9 +3,20 @@
<p>
组件包目前封装常用的四个组件:表格,搜索区域,分页,对话框。包npm地址为:https://www.npmjs.com/package/code-brick-zj。
</p>
<p>文档当前使用的组件包的版本为:1.0.2</p>
<p>文档当前使用的组件包的版本为:1.0.3</p>
<div class="block">
<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-card>
<h4>修改</h4>


+ 8
- 2
src/views/searchBar/searchBar.vue Vedi File

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


+ 7
- 0
src/views/table/singleHead.vue Vedi File

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


Caricamento…
Annulla
Salva