Skip to content

Q
quantum-blocks
Commit 9ca7da56 authored by 郭志伟's avatar 郭志伟
Browse files
Options

fix(qgtable): 隐藏已选表格

parent 161e6bae
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 17 deletions
app/web/page/editor/component/QgTable/index.vue
View file @ 9ca7da56
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<Option :value="isNum(value, item.number)" :key="value" v-for="(label,value) in item.option" :label="label" /> <Option :value="isNum(value, item.number)" :key="value" v-for="(label,value) in item.option" :label="label" />
</Select> </Select>
<DatePicker v-else-if="item.type === 'date'" class="timeWidth" type="datetimerange" placeholder="" v-model="searchForm[item.key]"></DatePicker> <DatePicker v-else-if="item.type === 'date'" class="timeWidth" type="datetimerange" placeholder="" v-model="searchForm[item.key]"></DatePicker>
<treeselect v-else-if="item.type === 'treeSelect'" v-model.number="searchForm[item.key]" :multiple="false" :options="item.option" placeholder="请选择" :normalizer="normalizer" style="width:180px" /> <treeselect v-else-if="item.type === 'treeSelect'" v-model.number="searchForm[item.key]" :multiple="false" :options="item.option" placeholder="请选择" :normalizer="normalizer" style="width: 180px;" />
</FormItem> </FormItem>
<FormItem class="btnGroupStyle"> <FormItem class="btnGroupStyle">
<div> <div>
...@@ -97,7 +97,7 @@ export default { ...@@ -97,7 +97,7 @@ export default {
}, },
title: String, title: String,
hideAdd: Boolean, hideAdd: Boolean,
showSelected: Boolean, // showSelected: false, // todo
request: Function, request: Function,
toolBar: Function, toolBar: Function,
height: Number, height: Number,
...@@ -111,6 +111,7 @@ export default { ...@@ -111,6 +111,7 @@ export default {
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
}, },
showSelected: false, // todo
searchCondition: [], searchCondition: [],
selectedTab: '1' selectedTab: '1'
}; };
...@@ -237,6 +238,7 @@ export default { ...@@ -237,6 +238,7 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
// @import '../../styles/comment.less'; // @import '../../styles/comment.less';
@padding: 25px; @padding: 25px;
.tableComStyle { .tableComStyle {
height: 100%; height: 100%;
background: #f5f5f5; background: #f5f5f5;
...@@ -245,50 +247,62 @@ export default { ...@@ -245,50 +247,62 @@ export default {
.searchFormStyle { .searchFormStyle {
text-align: left; text-align: left;
clear: both; clear: both;
background-color: #ffffff; background-color: #fff;
padding: @padding; padding: @padding;
min-height: 70px; min-height: 70px;
font-size: 0; font-size: 0;
.labelStyle { .labelStyle {
font-weight: bold !important; font-weight: bold !important;
display: inline-block; display: inline-block;
} }
/deep/ .ivu-form { /deep/ .ivu-form {
margin-bottom: -24px; margin-bottom: -24px;
} }
.required:before {
.required::before {
content: '* '; content: '* ';
color: #ed3f14; color: #ed3f14;
} }
} }
.btnStyle { .btnStyle {
margin-right: 10px; margin-right: 10px;
} }
.tableStyle { .tableStyle {
margin-top: 15px; margin-top: 15px;
} }
.comWidth { .comWidth {
width: 200px; width: 200px;
} }
.timeWidth { .timeWidth {
width: 320px; width: 320px;
} }
.btnGroupStyle { .btnGroupStyle {
text-align: left; text-align: left;
float: right; float: right;
} }
.inline { .inline {
display: inline-block; display: inline-block;
} }
.tableGroupStyle { .tableGroupStyle {
background: #ffffff; background: #fff;
padding: @padding; padding: @padding;
margin-top: 15px; margin-top: 15px;
.toolBarStyle { .toolBarStyle {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.pageStyle { .pageStyle {
margin-top: 20px; margin-top: 20px;
width: 100%; width: 100%;
...@@ -303,10 +317,12 @@ export default { ...@@ -303,10 +317,12 @@ export default {
font-weight: bold; font-weight: bold;
display: inline-block; display: inline-block;
} }
.ivu-form-item-content { .ivu-form-item-content {
display: inline-block; display: inline-block;
} }
} }
.table-tabs { .table-tabs {
width: 1030px; width: 1030px;
} }
......
package-lock.json
View file @ 9ca7da56
...@@ -1481,9 +1481,9 @@ ...@@ -1481,9 +1481,9 @@
"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
}, },
"@popperjs/core": { "@popperjs/core": {
"version": "2.10.1", "version": "2.10.2",
"resolved": "http://npmprivate.quantgroups.com/@popperjs%2fcore/-/core-2.10.1.tgz", "resolved": "http://npmprivate.quantgroups.com/@popperjs%2fcore/-/core-2.10.2.tgz",
"integrity": "sha1-co7NlasgequKmk5CHwQi2zKSMr4=" "integrity": "sha1-B5jAM1Hw3qGlpMq93yalWny+5ZA="
}, },
"@qg/apollo-nodejs": { "@qg/apollo-nodejs": {
"version": "2.1.2", "version": "2.1.2",
...@@ -1491,9 +1491,9 @@ ...@@ -1491,9 +1491,9 @@
"integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg==" "integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg=="
}, },
"@qg/cherry-ui": { "@qg/cherry-ui": {
"version": "2.23.8", "version": "2.23.9",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.23.8.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.23.9.tgz",
"integrity": "sha512-7QY0jxWn9LIYuvcvAMjXKR0CCAPb+LZ4yB10QGsk7lUk03t/yVGgExKGD3USJYaXh4NwOJrJ4TOdExoG1UY3Yg==", "integrity": "sha512-czpyl06OfKKnfUls4o5vX8chpeddc87l06E6lDiPks+mM47PJdhobGgvwDWZBIeYETBnlI+VqvUhAXeQ/ISTKg==",
"requires": { "requires": {
"@popperjs/core": "^2.5.4", "@popperjs/core": "^2.5.4",
"vue-lazyload": "^1.3.3", "vue-lazyload": "^1.3.3",
...@@ -1501,12 +1501,12 @@ ...@@ -1501,12 +1501,12 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.3.5-bata1", "version": "0.3.5-bata2",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.5-bata1.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.5-bata2.tgz",
"integrity": "sha512-4l8sFBS9UIcEc4WMOJGyH88dxrO3pVJyvcyk8OLjsfdcEM915rmNeXC//wZL7ZGcJyT0MI13A217EEwpiMCFjg==", "integrity": "sha512-NbKGpnoAdbYEMt3H3u6qSaj1g7BHrEYgILtTzrFaR1xIWHkpnNmFs+j3J3lgV3MR1a061PAiUD0r4SoPGydz1Q==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.23.8", "@qg/cherry-ui": "^2.23.9",
"@qg/js-bridge": "^1.1.12", "@qg/js-bridge": "^1.1.12",
"axios": "^0.21.1", "axios": "^0.21.1",
"intersection-observer": "^0.12.0", "intersection-observer": "^0.12.0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment