Compare commits

..

No commits in common. "e92b1dbea6daf20c3ee6af6fa52d5e2325297774" and "991ef8809ac029993590e89eb5f189df7543caa9" have entirely different histories.

4 changed files with 50 additions and 42 deletions

View File

@ -31,38 +31,39 @@ FluContentPage{
FluContentDialog{
id:custom_update_dialog
property var text
signal showDialog(string text,var callback)
property var _textBox
property var onAccpetListener
title:"修改列名"
negativeText:"取消"
contentDelegate: Component{
Item{
implicitWidth: parent.width
implicitHeight: 60
width: parent.width
height: 60
FluTextBox{
id:textbox_text
anchors.centerIn: parent
onTextChanged: {
custom_update_dialog.text = textbox_text.text
}
Connections{
target: custom_update_dialog
function onShowDialog(text,callback){
custom_update_dialog._textBox = textbox_text
custom_update_dialog.onAccpetListener = callback
textbox_text.text = text
textbox_text.forceActiveFocus()
custom_update_dialog.open()
}
}
Component.onCompleted: {
textbox_text.text = custom_update_dialog.text
textbox_text.forceActiveFocus()
}
}
}
onNegativeClicked:{
}
positiveText:"确定"
onPositiveClicked:{
if(custom_update_dialog.onAccpetListener){
custom_update_dialog.onAccpetListener(custom_update_dialog.text)
if(custom_update_dialog.onAccpetListener && custom_update_dialog._textBox){
custom_update_dialog.onAccpetListener(custom_update_dialog._textBox.text)
}
}
function showDialog(text,listener){
custom_update_dialog.text = text
custom_update_dialog.onAccpetListener = listener
custom_update_dialog.open()
}
}
Component{
@ -297,17 +298,19 @@ FluContentPage{
dataIndex: 'checkbox',
width:80,
minimumWidth:80,
maximumWidth:80
maximumWidth:80,
},
{
title: table_view.customItem(com_column_update_title,{title:'头像'}),
dataIndex: 'avatar',
width:100
width:100,
minimumWidth:100,
maximumWidth:100
},
{
title: '姓名',
dataIndex: 'name',
readOnly:true
readOnly:true,
},
{
title: table_view.customItem(com_column_sort_age,{sort:0}),
@ -411,4 +414,5 @@ FluContentPage{
root.dataSource = dataSource
table_view.dataSource = root.dataSource
}
}

View File

@ -31,38 +31,39 @@ FluContentPage{
FluContentDialog{
id:custom_update_dialog
property var text
signal showDialog(string text,var callback)
property var _textBox
property var onAccpetListener
title:"修改列名"
negativeText:"取消"
contentDelegate: Component{
Item{
implicitWidth: parent.width
implicitHeight: 60
width: parent.width
height: 60
FluTextBox{
id:textbox_text
anchors.centerIn: parent
onTextChanged: {
custom_update_dialog.text = textbox_text.text
}
Connections{
target: custom_update_dialog
function onShowDialog(text,callback){
custom_update_dialog._textBox = textbox_text
custom_update_dialog.onAccpetListener = callback
textbox_text.text = text
textbox_text.forceActiveFocus()
custom_update_dialog.open()
}
}
Component.onCompleted: {
textbox_text.text = custom_update_dialog.text
textbox_text.forceActiveFocus()
}
}
}
onNegativeClicked:{
}
positiveText:"确定"
onPositiveClicked:{
if(custom_update_dialog.onAccpetListener){
custom_update_dialog.onAccpetListener(custom_update_dialog.text)
if(custom_update_dialog.onAccpetListener && custom_update_dialog._textBox){
custom_update_dialog.onAccpetListener(custom_update_dialog._textBox.text)
}
}
function showDialog(text,listener){
custom_update_dialog.text = text
custom_update_dialog.onAccpetListener = listener
custom_update_dialog.open()
}
}
Component{
@ -297,17 +298,19 @@ FluContentPage{
dataIndex: 'checkbox',
width:80,
minimumWidth:80,
maximumWidth:80
maximumWidth:80,
},
{
title: table_view.customItem(com_column_update_title,{title:'头像'}),
dataIndex: 'avatar',
width:100
width:100,
minimumWidth:100,
maximumWidth:100
},
{
title: '姓名',
dataIndex: 'name',
readOnly:true
readOnly:true,
},
{
title: table_view.customItem(com_column_sort_age,{sort:0}),
@ -411,4 +414,5 @@ FluContentPage{
root.dataSource = dataSource
table_view.dataSource = root.dataSource
}
}

View File

@ -183,8 +183,8 @@ FluIconButton {
}
contentDelegate: Component{
Item{
implicitWidth: parent.width
implicitHeight: 100
width: parent.width
height: 100
Component.onCompleted: {
forceActiveFocus()
}

View File

@ -183,8 +183,8 @@ FluIconButton {
}
contentDelegate: Component{
Item{
implicitWidth: parent.width
implicitHeight: 100
width: parent.width
height: 100
Component.onCompleted: {
forceActiveFocus()
}