liunan #10

Merged
liunan merged 47 commits from liunan into master 2024-09-13 14:43:34 +08:00
4 changed files with 17 additions and 10 deletions
Showing only changes of commit 007853d66e - Show all commits

View File

@ -1,7 +1,7 @@
{ {
"name": "ag-element-ui", "name": "ag-element-ui",
"version": "0.1.1", "version": "0.1.3",
"main": "lib/ag-element-ui.common.js", "main": "packages/index.js",
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build",

View File

@ -39,7 +39,7 @@
</el-form-item> </el-form-item>
</ag-col> </ag-col>
</ag-row> </ag-row>
<div class="footerbox"> <div class="footerbox" v-if="$listeners.onSubmit">
<el-form-item > <el-form-item >
<slot name="button" :value="formValue"> <slot name="button" :value="formValue">
<el-button @click="onSubmit" type="primary" size="small" class="submitbtn"> <el-button @click="onSubmit" type="primary" size="small" class="submitbtn">

View File

@ -14,13 +14,11 @@
<ag-select :placeholder="item.placeholder" :value="item.value||''" closeable v-if="item.elem=='el-select'" :options="item.options" style="width:100%" @change="onSelect($event,item,index)"/> <ag-select :placeholder="item.placeholder" :value="item.value||''" closeable v-if="item.elem=='el-select'" :options="item.options" style="width:100%" @change="onSelect($event,item,index)"/>
</el-form-item> </el-form-item>
</ag-col> </ag-col>
<ag-col :offset="16" :span="8">
<el-form-item >
<el-button size="small" @click="onCancel">取消</el-button>
<el-button size="small" type="primary" @click="onQuery">查询</el-button>
</el-form-item>
</ag-col>
</ag-row> </ag-row>
<div class="footerbox">
<el-button size="small" @click="onCancel">取消</el-button>
<el-button size="small" type="primary" @click="onQuery">查询</el-button>
</div>
</el-form> </el-form>
</el-popover> </el-popover>
</div> </div>
@ -129,6 +127,12 @@
caret-color: transparent; /* 隐藏光标 */ caret-color: transparent; /* 隐藏光标 */
} }
} }
.footerbox{
display: flex;
align-items: center;
justify-content: flex-end;
margin-top:5px;
}
::v-deep { ::v-deep {
.el-form-item--small .el-form-item__label{ .el-form-item--small .el-form-item__label{
line-height: 40px; line-height: 40px;

View File

@ -69,6 +69,9 @@
.agtablebox{ .agtablebox{
background: #fff; background: #fff;
width: 100%; width: 100%;
height:100%;
display: flex;
flex-direction: column;
.agtablefooter{ .agtablefooter{
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;