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

Compare commits

base: mt-fe-group:058d51187f5aeefc700fd579dfde7eb255db2bf7
Branches Tags
mt-fe-group:develop
mt-fe-group:zjl
mt-fe-group:zhp
mt-fe-group:gtz
..
compare: mt-fe-group:482123258cae9410a7a3bcf7c92529ad04313573
Branches Tags
mt-fe-group:zjl
mt-fe-group:develop
mt-fe-group:zhp
mt-fe-group:gtz

No commits in common. "058d51187f5aeefc700fd579dfde7eb255db2bf7" and "482123258cae9410a7a3bcf7c92529ad04313573" have entirely different histories.
058d51187f ... 482123258c

3 changed files with 47 additions and 49 deletions
Show Stats 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.3", "version": "1.0.2",
"private": false, "private": false,
"description": "组件封装", "description": "组件封装",
"main": "index.js" "main": "index.js"

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

@ -12,7 +12,6 @@
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
@ -60,7 +59,6 @@
></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:350px' : (item.dateType === 'daterange' ? 'width:252px' : (item.dateType === 'datetime' ? 'width:200px' : 'width:148px')))" :style="item.width ? 'width:' + item.width + 'px' : (item.dateType === 'datetimerange' ? 'width:340px' : (item.dateType === 'daterange' ? 'width:220px' : 'width:140px'))"
/> />
<el-autocomplete <el-autocomplete
v-if="item.type === 'autocomplete'" v-if="item.type === 'autocomplete'"