Compare commits

..

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

3 changed files with 47 additions and 49 deletions

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"

View File

@ -12,55 +12,53 @@
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 "
type="text"
style="margin: 5px 0; padding: 0"
@click="
clickButton({
data: scope.row,
type: item.type
})
"
>
<span
v-if="
item.type === 'delete' ||
item.type === 'edit' ||
item.type === 'detail'
" "
type="text" class="iconfont"
style="margin: 5px 0; padding: 0" :class="
@click=" item.type === 'delete'
clickButton({ ? 'icon-delete' +
data: scope.row, (item.showParam
type: item.type ? !showFilter(item.showParam, scope.row)
}) ? ''
: ' delete-color'
: ' delete-color')
: item.type === 'edit'
? 'icon-edit' +
(item.showParam
? !showFilter(item.showParam, scope.row)
? ''
: ' primary-color'
: ' primary-color')
: item.type === 'detail'
? 'icon-detail' +
(item.showParam
? !showFilter(item.showParam, scope.row)
? ''
: ' primary-color'
: ' primary-color')
: ''
" "
> ></span>
<span <span v-else>{{ item.btnName }}</span>
v-if=" </el-button>
item.type === 'delete' ||
item.type === 'edit' ||
item.type === 'detail'
"
class="iconfont"
:class="
item.type === 'delete'
? 'icon-delete' +
(item.showParam
? !showFilter(item.showParam, scope.row)
? ''
: ' delete-color'
: ' delete-color')
: item.type === 'edit'
? 'icon-edit' +
(item.showParam
? !showFilter(item.showParam, scope.row)
? ''
: ' primary-color'
: ' primary-color')
: item.type === 'detail'
? 'icon-detail' +
(item.showParam
? !showFilter(item.showParam, scope.row)
? ''
: ' primary-color'
: ' primary-color')
: ''
"
></span>
<span v-else>{{ item.btnName }}</span>
</el-button>
</el-tooltip>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>

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'"