From 4a457e15faa716df9f34d7708ca3bd890b0f1ef8 Mon Sep 17 00:00:00 2001 From: ChaXxl Date: Sun, 11 Aug 2024 14:02:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=E4=B8=89?= =?UTF-8?q?=E5=85=83=E8=A1=A8=E8=BE=BE=E5=BC=8F=E6=9D=A5=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E7=9A=84=20source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/qml/page/T_TableView.qml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/example/qml/page/T_TableView.qml b/example/qml/page/T_TableView.qml index dc4ae88a..242fdb4b 100644 --- a/example/qml/page/T_TableView.qml +++ b/example/qml/page/T_TableView.qml @@ -315,12 +315,7 @@ FluContentPage{ radius: [20,20,20,20] Image{ anchors.fill: parent - source: { - if(options && options.avatar){ - return options.avatar - } - return "" - } + source: options && options.avatar ? options.avatar : "" sourceSize: Qt.size(80,80) } } From 2ee9bfed73cb88c4a60f4da783fca0120e4bde7e Mon Sep 17 00:00:00 2001 From: ChaXxl Date: Sun, 11 Aug 2024 14:18:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E3=80=81=E4=BF=AE=E6=AD=A3=20"The=20verification=20co?= =?UTF-8?q?de=20is=20correct"=20=E7=9A=84=E4=B8=AD=E6=96=87=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/example_en_US.ts | 28 ++++++++++++++-------------- example/example_zh_CN.ts | 30 +++++++++++++++--------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/example/example_en_US.ts b/example/example_en_US.ts index ab94d9b6..1e7b9ce7 100644 --- a/example/example_en_US.ts +++ b/example/example_en_US.ts @@ -2092,7 +2092,7 @@ Some contents... - + Name @@ -2112,67 +2112,67 @@ Some contents... - + Age - + Clear All - + Delete Selection - + Add a row of Data - + Insert a Row - + Focus not acquired: Please click any item in the form as the target for insertion! - + Avatar - + Address - + Nickname - + Long String - + Options - + <Previous - + Next> diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts index 9efff7ff..88b8c04d 100644 --- a/example/example_zh_CN.ts +++ b/example/example_zh_CN.ts @@ -1092,7 +1092,7 @@ Updated content: The verification code is correct - 验证码错误 + 验证成功 @@ -2274,7 +2274,7 @@ Some contents... - + Name 名称 @@ -2294,67 +2294,67 @@ Some contents... 全选 - + Age 年龄 - + Clear All 清除所有 - + Insert a Row 插入一行 - + Focus not acquired: Please click any item in the form as the target for insertion! 焦点未获取：请点击表格中的任意一项，作为插入的靶点！ - + Avatar 头像 - + Address 地址 - + Nickname 昵称 - + Long String 长字符串 - + Options 操作 - + <Previous <上一页 - + Next> 下一页> - + Delete Selection 删除选中 - + Add a row of Data 添加一行数据