Compare commits
No commits in common. "f2b67af58ae73996550049b494c78716d2157fab" and "4b01fcf2b457126bcec70a0a4168a8bdf979149f" have entirely different histories.
f2b67af58a
...
4b01fcf2b4
|
|
@ -50,7 +50,7 @@ FluScrollablePage{
|
||||||
FluRectangle{
|
FluRectangle{
|
||||||
width: 1920/4
|
width: 1920/4
|
||||||
height: 1200/4
|
height: 1200/4
|
||||||
radius:[8,8,8,8]
|
radius:[15,15,15,15]
|
||||||
Image {
|
Image {
|
||||||
id:image
|
id:image
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
|
|
|
||||||
|
|
@ -36,28 +36,20 @@ FluScrollablePage{
|
||||||
FluText{
|
FluText{
|
||||||
text:"轮播图，支持无限轮播，无限滑动，用ListView实现的组件"
|
text:"轮播图，支持无限轮播，无限滑动，用ListView实现的组件"
|
||||||
}
|
}
|
||||||
Item{
|
FluCarousel{
|
||||||
width: 400
|
radius:[5,5,5,5]
|
||||||
height: 300
|
delegate: Component{
|
||||||
FluShadow{
|
Image {
|
||||||
radius: 8
|
anchors.fill: parent
|
||||||
|
source: model.url
|
||||||
|
asynchronous: true
|
||||||
|
fillMode:Image.PreserveAspectCrop
|
||||||
|
}
|
||||||
}
|
}
|
||||||
FluCarousel{
|
Layout.topMargin: 20
|
||||||
anchors.fill: parent
|
Layout.leftMargin: 5
|
||||||
radius:[8,8,8,8]
|
Component.onCompleted: {
|
||||||
delegate: Component{
|
model = [{url:"qrc:/example/res/image/banner_1.jpg"},{url:"qrc:/example/res/image/banner_2.jpg"},{url:"qrc:/example/res/image/banner_3.jpg"}]
|
||||||
Image {
|
|
||||||
anchors.fill: parent
|
|
||||||
source: model.url
|
|
||||||
asynchronous: true
|
|
||||||
fillMode:Image.PreserveAspectCrop
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Layout.topMargin: 20
|
|
||||||
Layout.leftMargin: 5
|
|
||||||
Component.onCompleted: {
|
|
||||||
model = [{url:"qrc:/example/res/image/banner_1.jpg"},{url:"qrc:/example/res/image/banner_2.jpg"},{url:"qrc:/example/res/image/banner_3.jpg"}]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -74,55 +66,46 @@ FluScrollablePage{
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
left:parent.left
|
left:parent.left
|
||||||
}
|
}
|
||||||
Item{
|
FluCarousel{
|
||||||
width: 400
|
radius:[15,15,15,15]
|
||||||
height: 300
|
loopTime:1500
|
||||||
FluShadow{
|
indicatorGravity: Qt.AlignHCenter | Qt.AlignTop
|
||||||
radius: 8
|
indicatorMarginTop:15
|
||||||
}
|
delegate: Component{
|
||||||
FluCarousel{
|
Item{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
radius:[8,8,8,8]
|
Image {
|
||||||
loopTime:1500
|
|
||||||
indicatorGravity: Qt.AlignHCenter | Qt.AlignTop
|
|
||||||
indicatorMarginTop:15
|
|
||||||
delegate: Component{
|
|
||||||
Item{
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
Image {
|
source: model.url
|
||||||
|
asynchronous: true
|
||||||
|
fillMode:Image.PreserveAspectCrop
|
||||||
|
}
|
||||||
|
Rectangle{
|
||||||
|
height: 40
|
||||||
|
width: parent.width
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
color: "#33000000"
|
||||||
|
FluText{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
source: model.url
|
verticalAlignment: Qt.AlignVCenter
|
||||||
asynchronous: true
|
horizontalAlignment: Qt.AlignHCenter
|
||||||
fillMode:Image.PreserveAspectCrop
|
text:model.title
|
||||||
}
|
color: FluColors.Grey10
|
||||||
Rectangle{
|
font.pixelSize: 15
|
||||||
height: 40
|
|
||||||
width: parent.width
|
|
||||||
anchors.bottom: parent.bottom
|
|
||||||
color: "#33000000"
|
|
||||||
FluText{
|
|
||||||
anchors.fill: parent
|
|
||||||
verticalAlignment: Qt.AlignVCenter
|
|
||||||
horizontalAlignment: Qt.AlignHCenter
|
|
||||||
text:model.title
|
|
||||||
color: FluColors.Grey10
|
|
||||||
font.pixelSize: 15
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Layout.topMargin: 20
|
}
|
||||||
Layout.leftMargin: 5
|
Layout.topMargin: 20
|
||||||
Component.onCompleted: {
|
Layout.leftMargin: 5
|
||||||
var arr = []
|
Component.onCompleted: {
|
||||||
arr.push({url:"qrc:/example/res/image/banner_1.jpg",title:"共同应对全球性问题"})
|
var arr = []
|
||||||
arr.push({url:"qrc:/example/res/image/banner_2.jpg",title:"三小只全程没互动"})
|
arr.push({url:"qrc:/example/res/image/banner_1.jpg",title:"共同应对全球性问题"})
|
||||||
arr.push({url:"qrc:/example/res/image/banner_3.jpg",title:"有效投资扩大 激发增长动能"})
|
arr.push({url:"qrc:/example/res/image/banner_2.jpg",title:"三小只全程没互动"})
|
||||||
model = arr
|
arr.push({url:"qrc:/example/res/image/banner_3.jpg",title:"有效投资扩大 激发增长动能"})
|
||||||
}
|
model = arr
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,12 +70,12 @@ FluScrollablePage{
|
||||||
width: 220
|
width: 220
|
||||||
height: 240
|
height: 240
|
||||||
FluShadow{
|
FluShadow{
|
||||||
radius:5
|
radius:8
|
||||||
anchors.fill: item_content
|
anchors.fill: item_content
|
||||||
}
|
}
|
||||||
FluItem{
|
FluItem{
|
||||||
id:item_content
|
id:item_content
|
||||||
radius: [5,5,5,5]
|
radius: [8,8,8,8]
|
||||||
width: 200
|
width: 200
|
||||||
height: 220
|
height: 220
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
|
@ -89,7 +89,7 @@ FluScrollablePage{
|
||||||
}
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
radius: 5
|
radius: 8
|
||||||
color:{
|
color:{
|
||||||
if(FluTheme.dark){
|
if(FluTheme.dark){
|
||||||
if(item_mouse.containsMouse){
|
if(item_mouse.containsMouse){
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ FluScrollablePage{
|
||||||
FluRectangle{
|
FluRectangle{
|
||||||
width: 1920/5
|
width: 1920/5
|
||||||
height: 1200/5
|
height: 1200/5
|
||||||
radius:[8,8,8,8]
|
radius:[15,15,15,15]
|
||||||
Image {
|
Image {
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
source: "qrc:/example/res/image/banner_1.jpg"
|
source: "qrc:/example/res/image/banner_1.jpg"
|
||||||
|
|
|
||||||
|
|
@ -30,10 +30,9 @@ FluScrollablePage{
|
||||||
Layout.topMargin: 10
|
Layout.topMargin: 10
|
||||||
Layout.leftMargin: 4
|
Layout.leftMargin: 4
|
||||||
Layout.bottomMargin: 4
|
Layout.bottomMargin: 4
|
||||||
radius: 4
|
|
||||||
color: FluTheme.dark ? FluColors.Black : FluColors.White
|
color: FluTheme.dark ? FluColors.Black : FluColors.White
|
||||||
FluShadow{
|
FluShadow{
|
||||||
radius: 4
|
radius: 0
|
||||||
color: FluTheme.primaryColor.dark
|
color: FluTheme.primaryColor.dark
|
||||||
}
|
}
|
||||||
Image{
|
Image{
|
||||||
|
|
|
||||||
|
|
@ -164,9 +164,9 @@ CustomWindow {
|
||||||
height: parent.height
|
height: parent.height
|
||||||
z:999
|
z:999
|
||||||
//Stack模式，每次切换都会将页面压入栈中，随着栈的页面增多，消耗的内存也越多，内存消耗多就会卡顿，这时候就需要按返回将页面pop掉，释放内存。该模式可以配合FluPage中的launchMode属性，设置页面的启动模式
|
//Stack模式，每次切换都会将页面压入栈中，随着栈的页面增多，消耗的内存也越多，内存消耗多就会卡顿，这时候就需要按返回将页面pop掉，释放内存。该模式可以配合FluPage中的launchMode属性，设置页面的启动模式
|
||||||
// pageMode: FluNavigationViewType.Stack
|
pageMode: FluNavigationViewType.Stack
|
||||||
//NoStack模式，每次切换都会销毁之前的页面然后创建一个新的页面，只需消耗少量内存（推荐）
|
//NoStack模式，每次切换都会销毁之前的页面然后创建一个新的页面，只需消耗少量内存（推荐）
|
||||||
pageMode: FluNavigationViewType.NoStack
|
// pageMode: FluNavigationViewType.NoStack
|
||||||
items: ItemsOriginal
|
items: ItemsOriginal
|
||||||
footerItems:ItemsFooter
|
footerItems:ItemsFooter
|
||||||
topPadding:FluTools.isMacos() ? 20 : 0
|
topPadding:FluTools.isMacos() ? 20 : 0
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ FluScrollablePage{
|
||||||
FluRectangle{
|
FluRectangle{
|
||||||
width: 1920/4
|
width: 1920/4
|
||||||
height: 1200/4
|
height: 1200/4
|
||||||
radius:[8,8,8,8]
|
radius:[15,15,15,15]
|
||||||
Image {
|
Image {
|
||||||
id:image
|
id:image
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
|
|
|
||||||
|
|
@ -37,28 +37,20 @@ FluScrollablePage{
|
||||||
FluText{
|
FluText{
|
||||||
text:"轮播图，支持无限轮播，无限滑动，用ListView实现的组件"
|
text:"轮播图，支持无限轮播，无限滑动，用ListView实现的组件"
|
||||||
}
|
}
|
||||||
Item{
|
FluCarousel{
|
||||||
width: 400
|
radius:[5,5,5,5]
|
||||||
height: 300
|
delegate: Component{
|
||||||
FluShadow{
|
Image {
|
||||||
radius: 8
|
anchors.fill: parent
|
||||||
|
source: model.url
|
||||||
|
asynchronous: true
|
||||||
|
fillMode:Image.PreserveAspectCrop
|
||||||
|
}
|
||||||
}
|
}
|
||||||
FluCarousel{
|
Layout.topMargin: 20
|
||||||
anchors.fill: parent
|
Layout.leftMargin: 5
|
||||||
radius:[8,8,8,8]
|
Component.onCompleted: {
|
||||||
delegate: Component{
|
model = [{url:"qrc:/example/res/image/banner_1.jpg"},{url:"qrc:/example/res/image/banner_2.jpg"},{url:"qrc:/example/res/image/banner_3.jpg"}]
|
||||||
Image {
|
|
||||||
anchors.fill: parent
|
|
||||||
source: model.url
|
|
||||||
asynchronous: true
|
|
||||||
fillMode:Image.PreserveAspectCrop
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Layout.topMargin: 20
|
|
||||||
Layout.leftMargin: 5
|
|
||||||
Component.onCompleted: {
|
|
||||||
model = [{url:"qrc:/example/res/image/banner_1.jpg"},{url:"qrc:/example/res/image/banner_2.jpg"},{url:"qrc:/example/res/image/banner_3.jpg"}]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -75,55 +67,46 @@ FluScrollablePage{
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
left:parent.left
|
left:parent.left
|
||||||
}
|
}
|
||||||
Item{
|
FluCarousel{
|
||||||
width: 400
|
radius:[15,15,15,15]
|
||||||
height: 300
|
loopTime:1500
|
||||||
FluShadow{
|
indicatorGravity: Qt.AlignHCenter | Qt.AlignTop
|
||||||
radius: 8
|
indicatorMarginTop:15
|
||||||
}
|
delegate: Component{
|
||||||
FluCarousel{
|
Item{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
radius:[8,8,8,8]
|
Image {
|
||||||
loopTime:1500
|
|
||||||
indicatorGravity: Qt.AlignHCenter | Qt.AlignTop
|
|
||||||
indicatorMarginTop:15
|
|
||||||
delegate: Component{
|
|
||||||
Item{
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
Image {
|
source: model.url
|
||||||
|
asynchronous: true
|
||||||
|
fillMode:Image.PreserveAspectCrop
|
||||||
|
}
|
||||||
|
Rectangle{
|
||||||
|
height: 40
|
||||||
|
width: parent.width
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
color: "#33000000"
|
||||||
|
FluText{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
source: model.url
|
verticalAlignment: Qt.AlignVCenter
|
||||||
asynchronous: true
|
horizontalAlignment: Qt.AlignHCenter
|
||||||
fillMode:Image.PreserveAspectCrop
|
text:model.title
|
||||||
}
|
color: FluColors.Grey10
|
||||||
Rectangle{
|
font.pixelSize: 15
|
||||||
height: 40
|
|
||||||
width: parent.width
|
|
||||||
anchors.bottom: parent.bottom
|
|
||||||
color: "#33000000"
|
|
||||||
FluText{
|
|
||||||
anchors.fill: parent
|
|
||||||
verticalAlignment: Qt.AlignVCenter
|
|
||||||
horizontalAlignment: Qt.AlignHCenter
|
|
||||||
text:model.title
|
|
||||||
color: FluColors.Grey10
|
|
||||||
font.pixelSize: 15
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Layout.topMargin: 20
|
}
|
||||||
Layout.leftMargin: 5
|
Layout.topMargin: 20
|
||||||
Component.onCompleted: {
|
Layout.leftMargin: 5
|
||||||
var arr = []
|
Component.onCompleted: {
|
||||||
arr.push({url:"qrc:/example/res/image/banner_1.jpg",title:"共同应对全球性问题"})
|
var arr = []
|
||||||
arr.push({url:"qrc:/example/res/image/banner_2.jpg",title:"三小只全程没互动"})
|
arr.push({url:"qrc:/example/res/image/banner_1.jpg",title:"共同应对全球性问题"})
|
||||||
arr.push({url:"qrc:/example/res/image/banner_3.jpg",title:"有效投资扩大 激发增长动能"})
|
arr.push({url:"qrc:/example/res/image/banner_2.jpg",title:"三小只全程没互动"})
|
||||||
model = arr
|
arr.push({url:"qrc:/example/res/image/banner_3.jpg",title:"有效投资扩大 激发增长动能"})
|
||||||
}
|
model = arr
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -71,12 +71,12 @@ FluScrollablePage{
|
||||||
width: 220
|
width: 220
|
||||||
height: 240
|
height: 240
|
||||||
FluShadow{
|
FluShadow{
|
||||||
radius:5
|
radius:8
|
||||||
anchors.fill: item_content
|
anchors.fill: item_content
|
||||||
}
|
}
|
||||||
FluItem{
|
FluItem{
|
||||||
id:item_content
|
id:item_content
|
||||||
radius: [5,5,5,5]
|
radius: [8,8,8,8]
|
||||||
width: 200
|
width: 200
|
||||||
height: 220
|
height: 220
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
|
@ -90,7 +90,7 @@ FluScrollablePage{
|
||||||
}
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
radius: 5
|
radius: 8
|
||||||
color:{
|
color:{
|
||||||
if(FluTheme.dark){
|
if(FluTheme.dark){
|
||||||
if(item_mouse.containsMouse){
|
if(item_mouse.containsMouse){
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ FluScrollablePage{
|
||||||
FluRectangle{
|
FluRectangle{
|
||||||
width: 1920/5
|
width: 1920/5
|
||||||
height: 1200/5
|
height: 1200/5
|
||||||
radius:[8,8,8,8]
|
radius:[15,15,15,15]
|
||||||
Image {
|
Image {
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
source: "qrc:/example/res/image/banner_1.jpg"
|
source: "qrc:/example/res/image/banner_1.jpg"
|
||||||
|
|
|
||||||
|
|
@ -31,10 +31,9 @@ FluScrollablePage{
|
||||||
Layout.topMargin: 10
|
Layout.topMargin: 10
|
||||||
Layout.leftMargin: 4
|
Layout.leftMargin: 4
|
||||||
Layout.bottomMargin: 4
|
Layout.bottomMargin: 4
|
||||||
radius: 4
|
|
||||||
color: FluTheme.dark ? FluColors.Black : FluColors.White
|
color: FluTheme.dark ? FluColors.Black : FluColors.White
|
||||||
FluShadow{
|
FluShadow{
|
||||||
radius: 4
|
radius: 0
|
||||||
color: FluTheme.primaryColor.dark
|
color: FluTheme.primaryColor.dark
|
||||||
}
|
}
|
||||||
Image{
|
Image{
|
||||||
|
|
|
||||||
|
|
@ -139,7 +139,7 @@ CustomWindow {
|
||||||
id:loader
|
id:loader
|
||||||
lazy: true
|
lazy: true
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
source: "https://zhu-zichu.gitee.io/Qt5_156_LieflatPage.qml"
|
source: "https://zhu-zichu.gitee.io/Qt6_156_LieflatPage.qml"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
front: Item{
|
front: Item{
|
||||||
|
|
@ -165,9 +165,9 @@ CustomWindow {
|
||||||
height: parent.height
|
height: parent.height
|
||||||
z:999
|
z:999
|
||||||
//Stack模式，每次切换都会将页面压入栈中，随着栈的页面增多，消耗的内存也越多，内存消耗多就会卡顿，这时候就需要按返回将页面pop掉，释放内存。该模式可以配合FluPage中的launchMode属性，设置页面的启动模式
|
//Stack模式，每次切换都会将页面压入栈中，随着栈的页面增多，消耗的内存也越多，内存消耗多就会卡顿，这时候就需要按返回将页面pop掉，释放内存。该模式可以配合FluPage中的launchMode属性，设置页面的启动模式
|
||||||
// pageMode: FluNavigationViewType.Stack
|
pageMode: FluNavigationViewType.Stack
|
||||||
//NoStack模式，每次切换都会销毁之前的页面然后创建一个新的页面，只需消耗少量内存（推荐）
|
//NoStack模式，每次切换都会销毁之前的页面然后创建一个新的页面，只需消耗少量内存（推荐）
|
||||||
pageMode: FluNavigationViewType.NoStack
|
// pageMode: FluNavigationViewType.NoStack
|
||||||
items: ItemsOriginal
|
items: ItemsOriginal
|
||||||
footerItems:ItemsFooter
|
footerItems:ItemsFooter
|
||||||
topPadding:FluTools.isMacos() ? 20 : 0
|
topPadding:FluTools.isMacos() ? 20 : 0
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ Rectangle {
|
||||||
radius: 4
|
radius: 4
|
||||||
border.width: 1
|
border.width: 1
|
||||||
border.color: dividerColor
|
border.color: dividerColor
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
if(current){
|
if(current){
|
||||||
const date = current
|
const date = current
|
||||||
|
|
@ -32,6 +33,7 @@ Rectangle {
|
||||||
text_date.text = year+"-"+(month+1)+"-"+day
|
text_date.text = year+"-"+(month+1)+"-"+day
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea{
|
MouseArea{
|
||||||
id:mouse_area
|
id:mouse_area
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ Item {
|
||||||
property var date: new Date()
|
property var date: new Date()
|
||||||
property var currentDate : new Date()
|
property var currentDate : new Date()
|
||||||
property var toDay: new Date()
|
property var toDay: new Date()
|
||||||
property int radius: 5
|
|
||||||
signal dateClicked(var date)
|
signal dateClicked(var date)
|
||||||
id:control
|
id:control
|
||||||
width: 280
|
width: 280
|
||||||
|
|
@ -215,7 +214,10 @@ Item {
|
||||||
}
|
}
|
||||||
FluArea{
|
FluArea{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
radius: control.radius
|
radius: 5
|
||||||
|
FluShadow{
|
||||||
|
radius: 5
|
||||||
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
id:layout_divider
|
id:layout_divider
|
||||||
height: 1
|
height: 1
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ Canvas {
|
||||||
jsChart.update();
|
jsChart.update();
|
||||||
chartAnimator.restart();
|
chartAnimator.restart();
|
||||||
}
|
}
|
||||||
|
opacity:
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: event
|
id: event
|
||||||
anchors.fill: control
|
anchors.fill: control
|
||||||
|
|
@ -89,7 +90,7 @@ Canvas {
|
||||||
control.requestPaint();
|
control.requestPaint();
|
||||||
}
|
}
|
||||||
onPaint: {
|
onPaint: {
|
||||||
if(control.getContext('2d') !== null && memorizedContext !== control.getContext('2d') || memorizedData !== control.chartData || memorizedOptions !== control.chartOptions) {
|
if(control.getContext('2d') !== null && memorizedContext !== control.getContext('2d') || memorizedData !== control.chartData || memorizedOptions !== control.chartOptions) {
|
||||||
var ctx = control.getContext('2d');
|
var ctx = control.getContext('2d');
|
||||||
|
|
||||||
jsChart = Chart.build(ctx, {
|
jsChart = Chart.build(ctx, {
|
||||||
|
|
|
||||||
|
|
@ -4,14 +4,15 @@ import FluentUI 1.0
|
||||||
import "ColorPicker"
|
import "ColorPicker"
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id:control
|
|
||||||
property alias colorValue: color_picker.colorValue
|
property alias colorValue: color_picker.colorValue
|
||||||
property int radius: 5
|
|
||||||
width: color_picker.width+10
|
width: color_picker.width+10
|
||||||
height: color_picker.height
|
height: color_picker.height
|
||||||
FluArea{
|
FluArea{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
radius: control.radius
|
radius: 5
|
||||||
|
FluShadow{
|
||||||
|
radius: 5
|
||||||
|
}
|
||||||
ColorPicker{
|
ColorPicker{
|
||||||
id:color_picker
|
id:color_picker
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,12 +20,12 @@ T.ScrollBar {
|
||||||
property int minLine : 2
|
property int minLine : 2
|
||||||
property int maxLine : 6
|
property int maxLine : 6
|
||||||
}
|
}
|
||||||
verticalPadding : vertical ? 15 : 3
|
verticalPadding : vertical ? 15 : 2
|
||||||
horizontalPadding : horizontal ? 15 : 3
|
horizontalPadding : horizontal ? 15 : 2
|
||||||
background: Rectangle{
|
background: Rectangle{
|
||||||
id:back_rect
|
id:back_rect
|
||||||
radius: 5
|
radius: 5
|
||||||
color:FluTheme.dark ? Qt.rgba(44/255,44/255,44/255,1) : Qt.rgba(255/255,255/255,255/255,1)
|
color:FluTheme.dark ? Qt.rgba(44/255,44/255,44/255,1) : Qt.rgba(255/255,255/255,255/255,1)
|
||||||
opacity:{
|
opacity:{
|
||||||
if(vertical){
|
if(vertical){
|
||||||
return d.maxLine === Number(rect_bar.width)
|
return d.maxLine === Number(rect_bar.width)
|
||||||
|
|
@ -34,21 +34,21 @@ T.ScrollBar {
|
||||||
}
|
}
|
||||||
Behavior on opacity {
|
Behavior on opacity {
|
||||||
NumberAnimation{
|
NumberAnimation{
|
||||||
duration: 50
|
duration: 167
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluIconButton{
|
FluIconButton{
|
||||||
width: 12
|
width: 10
|
||||||
height: 12
|
height: 10
|
||||||
iconSize: 8
|
iconSize: 6
|
||||||
verticalPadding: 0
|
verticalPadding: 0
|
||||||
horizontalPadding: 0
|
horizontalPadding: 0
|
||||||
visible: control.horizontal
|
visible: control.horizontal
|
||||||
opacity: back_rect.opacity
|
opacity: back_rect.opacity
|
||||||
anchors{
|
anchors{
|
||||||
left: parent.left
|
left: parent.left
|
||||||
leftMargin: 2
|
leftMargin: 4
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
}
|
}
|
||||||
iconColor: control.color
|
iconColor: control.color
|
||||||
|
|
@ -58,16 +58,16 @@ T.ScrollBar {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluIconButton{
|
FluIconButton{
|
||||||
width: 12
|
width: 10
|
||||||
height: 12
|
height: 10
|
||||||
iconSize: 8
|
iconSize: 6
|
||||||
verticalPadding: 0
|
verticalPadding: 0
|
||||||
horizontalPadding: 0
|
horizontalPadding: 0
|
||||||
iconColor: control.color
|
iconColor: control.color
|
||||||
opacity: back_rect.opacity
|
opacity: back_rect.opacity
|
||||||
anchors{
|
anchors{
|
||||||
right: parent.right
|
right: parent.right
|
||||||
rightMargin: 2
|
rightMargin: 4
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
}
|
}
|
||||||
visible: control.horizontal
|
visible: control.horizontal
|
||||||
|
|
@ -77,16 +77,16 @@ T.ScrollBar {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluIconButton{
|
FluIconButton{
|
||||||
width: 12
|
width: 10
|
||||||
height: 12
|
height: 10
|
||||||
iconSize: 8
|
iconSize: 6
|
||||||
verticalPadding: 0
|
verticalPadding: 0
|
||||||
horizontalPadding: 0
|
horizontalPadding: 0
|
||||||
iconColor: control.color
|
iconColor: control.color
|
||||||
opacity: back_rect.opacity
|
opacity: back_rect.opacity
|
||||||
anchors{
|
anchors{
|
||||||
top: parent.top
|
top: parent.top
|
||||||
topMargin: 2
|
topMargin: 4
|
||||||
horizontalCenter: parent.horizontalCenter
|
horizontalCenter: parent.horizontalCenter
|
||||||
}
|
}
|
||||||
visible: control.vertical
|
visible: control.vertical
|
||||||
|
|
@ -96,16 +96,16 @@ T.ScrollBar {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluIconButton{
|
FluIconButton{
|
||||||
width: 12
|
width: 10
|
||||||
height: 12
|
height: 10
|
||||||
iconSize: 8
|
iconSize: 6
|
||||||
verticalPadding: 0
|
verticalPadding: 0
|
||||||
horizontalPadding: 0
|
horizontalPadding: 0
|
||||||
iconColor: control.color
|
iconColor: control.color
|
||||||
opacity: back_rect.opacity
|
opacity: back_rect.opacity
|
||||||
anchors{
|
anchors{
|
||||||
bottom: parent.bottom
|
bottom: parent.bottom
|
||||||
bottomMargin: 2
|
bottomMargin: 4
|
||||||
horizontalCenter: parent.horizontalCenter
|
horizontalCenter: parent.horizontalCenter
|
||||||
}
|
}
|
||||||
visible: control.vertical
|
visible: control.vertical
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ import FluentUI 1.0
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
//高性能阴影！！！比DropShadow阴影性能高出数倍！！！
|
//高性能阴影！！！比DropShadow阴影性能高出数倍！！！
|
||||||
property color color: FluTheme.dark ? "#FFFFFF" : "#999999"
|
property color color: FluTheme.dark ? "#999999" : "#999999"
|
||||||
property int elevation: 6
|
property int elevation: 5
|
||||||
property int radius: 4
|
property int radius: 4
|
||||||
id:control
|
id:control
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
@ -14,9 +14,9 @@ Item {
|
||||||
Rectangle{
|
Rectangle{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
color: "#00000000"
|
color: "#00000000"
|
||||||
opacity: 0.01 * (elevation-index+1)
|
opacity: 0.02 * (elevation-index+1)
|
||||||
anchors.margins: -index
|
anchors.margins: -index+1
|
||||||
radius: control.radius+index
|
radius: control.radius
|
||||||
border.width: index
|
border.width: index
|
||||||
border.color: control.color
|
border.color: control.color
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,6 @@ Rectangle {
|
||||||
Component{
|
Component{
|
||||||
id:com_edit
|
id:com_edit
|
||||||
FluTextBox{
|
FluTextBox{
|
||||||
id:text_box
|
|
||||||
text: display
|
text: display
|
||||||
readOnly: true === columnSource[column].readOnly
|
readOnly: true === columnSource[column].readOnly
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
|
|
@ -76,7 +75,7 @@ Rectangle {
|
||||||
}
|
}
|
||||||
onCommit: {
|
onCommit: {
|
||||||
if(!readOnly){
|
if(!readOnly){
|
||||||
display = text_box.text
|
display = text
|
||||||
}
|
}
|
||||||
tableView.closeEditor()
|
tableView.closeEditor()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,6 @@ FluMenu{
|
||||||
text:pasteText
|
text:pasteText
|
||||||
focus: false
|
focus: false
|
||||||
padding: 0
|
padding: 0
|
||||||
visible: !inputItem.readOnly
|
|
||||||
height: visible ? 36 : 0
|
height: visible ? 36 : 0
|
||||||
onClicked: {
|
onClicked: {
|
||||||
inputItem.paste()
|
inputItem.paste()
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ Rectangle {
|
||||||
radius: 4
|
radius: 4
|
||||||
border.width: 1
|
border.width: 1
|
||||||
border.color: dividerColor
|
border.color: dividerColor
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
if(current){
|
if(current){
|
||||||
const date = current
|
const date = current
|
||||||
|
|
@ -32,6 +33,7 @@ Rectangle {
|
||||||
text_date.text = year+"-"+(month+1)+"-"+day
|
text_date.text = year+"-"+(month+1)+"-"+day
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea{
|
MouseArea{
|
||||||
id:mouse_area
|
id:mouse_area
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ Item {
|
||||||
property var date: new Date()
|
property var date: new Date()
|
||||||
property var currentDate : new Date()
|
property var currentDate : new Date()
|
||||||
property var toDay: new Date()
|
property var toDay: new Date()
|
||||||
property int radius: 5
|
|
||||||
signal dateClicked(var date)
|
signal dateClicked(var date)
|
||||||
id:control
|
id:control
|
||||||
width: 280
|
width: 280
|
||||||
|
|
@ -215,7 +214,10 @@ Item {
|
||||||
}
|
}
|
||||||
FluArea{
|
FluArea{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
radius: control.radius
|
radius: 5
|
||||||
|
FluShadow{
|
||||||
|
radius: 5
|
||||||
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
id:layout_divider
|
id:layout_divider
|
||||||
height: 1
|
height: 1
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import QtQuick
|
import QtQuick 2.13
|
||||||
import "./../JS/Chart.js" as Chart
|
import "./../JS/Chart.js" as Chart
|
||||||
|
|
||||||
Canvas {
|
Canvas {
|
||||||
|
|
|
||||||
|
|
@ -4,14 +4,15 @@ import FluentUI
|
||||||
import "ColorPicker"
|
import "ColorPicker"
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id:control
|
|
||||||
property alias colorValue: color_picker.colorValue
|
property alias colorValue: color_picker.colorValue
|
||||||
property int radius: 5
|
|
||||||
width: color_picker.width+10
|
width: color_picker.width+10
|
||||||
height: color_picker.height
|
height: color_picker.height
|
||||||
FluArea{
|
FluArea{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
radius: control.radius
|
radius: 5
|
||||||
|
FluShadow{
|
||||||
|
radius: 5
|
||||||
|
}
|
||||||
ColorPicker{
|
ColorPicker{
|
||||||
id:color_picker
|
id:color_picker
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,12 +21,12 @@ T.ScrollBar {
|
||||||
property int minLine : 2
|
property int minLine : 2
|
||||||
property int maxLine : 6
|
property int maxLine : 6
|
||||||
}
|
}
|
||||||
verticalPadding : vertical ? 15 : 3
|
verticalPadding : vertical ? 15 : 2
|
||||||
horizontalPadding : horizontal ? 15 : 3
|
horizontalPadding : horizontal ? 15 : 2
|
||||||
background: Rectangle{
|
background: Rectangle{
|
||||||
id:back_rect
|
id:back_rect
|
||||||
radius: 5
|
radius: 5
|
||||||
color:FluTheme.dark ? Qt.rgba(44/255,44/255,44/255,1) : Qt.rgba(255/255,255/255,255/255,1)
|
color:FluTheme.dark ? Qt.rgba(44/255,44/255,44/255,1) : Qt.rgba(255/255,255/255,255/255,1)
|
||||||
opacity:{
|
opacity:{
|
||||||
if(vertical){
|
if(vertical){
|
||||||
return d.maxLine === Number(rect_bar.width)
|
return d.maxLine === Number(rect_bar.width)
|
||||||
|
|
@ -35,21 +35,21 @@ T.ScrollBar {
|
||||||
}
|
}
|
||||||
Behavior on opacity {
|
Behavior on opacity {
|
||||||
NumberAnimation{
|
NumberAnimation{
|
||||||
duration: 50
|
duration: 167
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluIconButton{
|
FluIconButton{
|
||||||
width: 12
|
width: 10
|
||||||
height: 12
|
height: 10
|
||||||
iconSize: 8
|
iconSize: 6
|
||||||
verticalPadding: 0
|
verticalPadding: 0
|
||||||
horizontalPadding: 0
|
horizontalPadding: 0
|
||||||
visible: control.horizontal
|
visible: control.horizontal
|
||||||
opacity: back_rect.opacity
|
opacity: back_rect.opacity
|
||||||
anchors{
|
anchors{
|
||||||
left: parent.left
|
left: parent.left
|
||||||
leftMargin: 2
|
leftMargin: 4
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
}
|
}
|
||||||
iconColor: control.color
|
iconColor: control.color
|
||||||
|
|
@ -59,16 +59,16 @@ T.ScrollBar {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluIconButton{
|
FluIconButton{
|
||||||
width: 12
|
width: 10
|
||||||
height: 12
|
height: 10
|
||||||
iconSize: 8
|
iconSize: 6
|
||||||
verticalPadding: 0
|
verticalPadding: 0
|
||||||
horizontalPadding: 0
|
horizontalPadding: 0
|
||||||
iconColor: control.color
|
iconColor: control.color
|
||||||
opacity: back_rect.opacity
|
opacity: back_rect.opacity
|
||||||
anchors{
|
anchors{
|
||||||
right: parent.right
|
right: parent.right
|
||||||
rightMargin: 2
|
rightMargin: 4
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
}
|
}
|
||||||
visible: control.horizontal
|
visible: control.horizontal
|
||||||
|
|
@ -78,16 +78,16 @@ T.ScrollBar {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluIconButton{
|
FluIconButton{
|
||||||
width: 12
|
width: 10
|
||||||
height: 12
|
height: 10
|
||||||
iconSize: 8
|
iconSize: 6
|
||||||
verticalPadding: 0
|
verticalPadding: 0
|
||||||
horizontalPadding: 0
|
horizontalPadding: 0
|
||||||
iconColor: control.color
|
iconColor: control.color
|
||||||
opacity: back_rect.opacity
|
opacity: back_rect.opacity
|
||||||
anchors{
|
anchors{
|
||||||
top: parent.top
|
top: parent.top
|
||||||
topMargin: 2
|
topMargin: 4
|
||||||
horizontalCenter: parent.horizontalCenter
|
horizontalCenter: parent.horizontalCenter
|
||||||
}
|
}
|
||||||
visible: control.vertical
|
visible: control.vertical
|
||||||
|
|
@ -97,16 +97,16 @@ T.ScrollBar {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluIconButton{
|
FluIconButton{
|
||||||
width: 12
|
width: 10
|
||||||
height: 12
|
height: 10
|
||||||
iconSize: 8
|
iconSize: 6
|
||||||
verticalPadding: 0
|
verticalPadding: 0
|
||||||
horizontalPadding: 0
|
horizontalPadding: 0
|
||||||
iconColor: control.color
|
iconColor: control.color
|
||||||
opacity: back_rect.opacity
|
opacity: back_rect.opacity
|
||||||
anchors{
|
anchors{
|
||||||
bottom: parent.bottom
|
bottom: parent.bottom
|
||||||
bottomMargin: 2
|
bottomMargin: 4
|
||||||
horizontalCenter: parent.horizontalCenter
|
horizontalCenter: parent.horizontalCenter
|
||||||
}
|
}
|
||||||
visible: control.vertical
|
visible: control.vertical
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ import FluentUI
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
//高性能阴影！！！比DropShadow阴影性能高出数倍！！！
|
//高性能阴影！！！比DropShadow阴影性能高出数倍！！！
|
||||||
property color color: FluTheme.dark ? "#FFFFFF" : "#999999"
|
property color color: FluTheme.dark ? "#999999" : "#999999"
|
||||||
property int elevation: 6
|
property int elevation: 5
|
||||||
property int radius: 4
|
property int radius: 4
|
||||||
id:control
|
id:control
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
@ -14,9 +14,9 @@ Item {
|
||||||
Rectangle{
|
Rectangle{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
color: "#00000000"
|
color: "#00000000"
|
||||||
opacity: 0.01 * (elevation-index+1)
|
opacity: 0.02 * (elevation-index+1)
|
||||||
anchors.margins: -index
|
anchors.margins: -index+1
|
||||||
radius: control.radius+index
|
radius: control.radius
|
||||||
border.width: index
|
border.width: index
|
||||||
border.color: control.color
|
border.color: control.color
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,6 @@ Rectangle {
|
||||||
Component{
|
Component{
|
||||||
id:com_edit
|
id:com_edit
|
||||||
FluTextBox{
|
FluTextBox{
|
||||||
id:text_box
|
|
||||||
text: display
|
text: display
|
||||||
readOnly: true === columnSource[column].readOnly
|
readOnly: true === columnSource[column].readOnly
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
|
|
@ -78,7 +77,7 @@ Rectangle {
|
||||||
}
|
}
|
||||||
onCommit: {
|
onCommit: {
|
||||||
if(!readOnly){
|
if(!readOnly){
|
||||||
display = text_box.text
|
display = text
|
||||||
}
|
}
|
||||||
tableView.closeEditor()
|
tableView.closeEditor()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,6 @@ FluMenu{
|
||||||
text:pasteText
|
text:pasteText
|
||||||
focus: false
|
focus: false
|
||||||
padding: 0
|
padding: 0
|
||||||
visible: !inputItem.readOnly
|
|
||||||
height: visible ? 36 : 0
|
height: visible ? 36 : 0
|
||||||
onClicked: {
|
onClicked: {
|
||||||
inputItem.paste()
|
inputItem.paste()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue