mt-fe-group/cnbmai-ui
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request '增加table操作列的tooltip,修改时间选择器的默认width' (#7) from zjl into develop

Browse Source 
Reviewed-on: #7
This commit is contained in:
朱菊兰 2023-11-24 10:57:49 +08:00
commit 058d51187f
3 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "code-brick-zj", "name": "code-brick-zj",
"version": "1.0.2", "version": "1.0.3",
"private": false, "private": false,
"description": "组件封装", "description": "组件封装",
"main": "index.js" "main": "index.js"

2
src/components/BaseTable/subcomponents/MethodBtn.vue
View File

@ -12,6 +12,7 @@
style="margin: 0 4px; font-size: 18px; color: #e5e7eb" style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
>|</span >|</span
> >
<el-tooltip :disabled="item.showTip?false:true" :content="item.showTip" placement="top">
<el-button <el-button
:disabled=" :disabled="
item.showParam ? !showFilter(item.showParam, scope.row) : false item.showParam ? !showFilter(item.showParam, scope.row) : false
@ -59,6 +60,7 @@
></span> ></span>
<span v-else>{{ item.btnName }}</span> <span v-else>{{ item.btnName }}</span>
</el-button> </el-button>
</el-tooltip>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>

2
src/components/SearchBar/SearchBar.vue
View File

@ -63,7 +63,7 @@
:placeholder="item.placeholder" :placeholder="item.placeholder"
:picker-options="item.pickerOptions ? item.pickerOptions : null" :picker-options="item.pickerOptions ? item.pickerOptions : null"
:clearable="item.clearable === false ? false : true" :clearable="item.clearable === false ? false : true"
:style="item.width ? 'width:' + item.width + 'px' : (item.dateType === 'datetimerange' ? 'width:340px' : (item.dateType === 'daterange' ? 'width:220px' : 'width:140px'))" :style="item.width ? 'width:' + item.width + 'px' : (item.dateType === 'datetimerange' ? 'width:350px' : (item.dateType === 'daterange' ? 'width:252px' : (item.dateType === 'datetime' ? 'width:200px' : 'width:148px')))"
/> />
<el-autocomplete <el-autocomplete
v-if="item.type === 'autocomplete'" v-if="item.type === 'autocomplete'"