update

example/qml/page/T_3D.qml

@@ -55,7 +55,7 @@ FluContentPage{
             }
             PhongMaterial {
                 id: material
-                ambient: color_picker.colorValue
+                ambient: color_picker.current
             }
             Transform{
                 id:transform
@@ -92,10 +92,7 @@ FluContentPage{
             }
             FluColorPicker{
                 id:color_picker
-                enableAlphaChannel:false
-                Component.onCompleted: {
-                    setColor("gray")
-                }
+                current: "gray"
             }
         }
 

example/qml/page/T_Acrylic.qml

@@ -64,7 +64,7 @@ FluScrollablePage{
                 width: 200
                 height: 200
                 tintOpacity: slider_tint_opacity.value/100
-                tintColor: color_picker.colorValue
+                tintColor: color_picker.current
                 blurRadius: slider_blur_radius.value
                 x:(image.width-width)/2
                 y:(image.height-height)/2

example/qml/page/T_ColorPicker.qml

@@ -9,38 +9,6 @@ FluScrollablePage{
 
     title:"ColorPicker"
 
-    FluArea{
-        Layout.fillWidth: true
-        height: 280
-        Layout.topMargin: 20
-        paddings: 10
-        ColumnLayout{
-            anchors{
-                verticalCenter: parent.verticalCenter
-                left:parent.left
-            }
-            FluText{
-                text:"此颜色组件是Github上的开源项目"
-            }
-            FluTextButton{
-                text:"https://github.com/rshest/qml-colorpicker"
-                onClicked: {
-                    Qt.openUrlExternally(text)
-                }
-            }
-            FluColorView{
-
-            }
-        }
-    }
-    CodeExpander{
-        Layout.fillWidth: true
-        Layout.topMargin: -1
-        code:'FluColorView{
-
-}'
-    }
-
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20

example/qml/page/T_Dialog.qml

@@ -182,8 +182,8 @@ FluScrollablePage{
             showSuccess("点击取消按钮")
         }
         positiveText:"确定"
-        onPositiveClicked:{
-            showSuccess("点击确定按钮")
+        onPositiveClickListener:function(){
+            showError("测试InfoBar层级在Popup之上")
         }
     }
 

example/qml/page/T_QRCode.qml

@@ -14,8 +14,8 @@ FluScrollablePage{
         Layout.topMargin: 20
         size:slider_size.value
         text:text_box.text
-        color:color_picker.colorValue
-        bgColor: bgcolor_picker.colorValue
+        color:color_picker.current
+        bgColor: bgcolor_picker.current
         margins:slider_margins.value
         Layout.preferredWidth: size
         Layout.preferredHeight: size
@@ -44,9 +44,7 @@ FluScrollablePage{
         }
         FluColorPicker{
             id:color_picker
-            Component.onCompleted: {
-                setColor(Qt.rgba(0,0,0,1))
-            }
+            current: Qt.rgba(0,0,0,1)
         }
     }
 
@@ -59,9 +57,7 @@ FluScrollablePage{
         }
         FluColorPicker{
             id:bgcolor_picker
-            Component.onCompleted: {
-                setColor(Qt.rgba(1,1,1,1))
-            }
+            current: Qt.rgba(1,1,1,1)
         }
     }
 

example/qml/page/T_Watermark.qml

@@ -111,9 +111,7 @@ FluContentPage{
                 }
                 FluColorPicker{
                     id:color_picker
-                    Component.onCompleted: {
-                        setColor(Qt.rgba(0,0,0,0.1))
-                    }
+                    current: Qt.rgba(0,0,0,0.1)
                 }
             }
         }
@@ -122,7 +120,7 @@ FluContentPage{
             id:water_mark
             anchors.fill: parent
             text:text_box.text
-            textColor: color_picker.colorValue
+            textColor: color_picker.current
             textSize: slider_text_size.value
             rotate: slider_rotate.value
             gap:Qt.point(slider_gap_x.value,slider_gap_y.value)

example/qml/window/LoginWindow.qml

@@ -11,7 +11,7 @@ FluWindow {
     width: 400
     height: 400
     fixSize: true
-
+    modality: Qt.ApplicationModal
     onInitArgument:
         (argument)=>{
             textbox_uesrname.updateText(argument.username)