From 85e1b027274b37487ca1b6965a5d65adf4475499 Mon Sep 17 00:00:00 2001 From: jiyu Date: Mon, 17 Feb 2025 11:22:42 +0000 Subject: [PATCH 01/11] =?UTF-8?q?=E9=AB=98=E9=98=B6Search=E8=BE=B9?= =?UTF-8?q?=E8=B7=9D=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiyu --- atomicservicesearch/interfaces/atomicservicesearch.js | 10 +++++----- atomicservicesearch/source/atomicservicesearch.ets | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index e1e0ec2..b35b600 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -41,7 +41,7 @@ const OPERATION_ITEM1_MARGIN_RIGHT = 2; const OPERATION_ITEM2_MARGIN_LEFT = 8; export class AtomicServiceSearch extends ViewPU { - + constructor(parent, params, __localStorage, elmtId = -1, paramsLambda = undefined, extraInfo) { super(parent, __localStorage, elmtId, extraInfo); if (typeof paramsLambda === 'function') { @@ -162,7 +162,7 @@ export class AtomicServiceSearch extends ViewPU { get isSearchPressed() { return this.__isSearchPressed.get(); } - + set isSearchPressed(newValue) { this.__isSearchPressed.set(newValue); } @@ -424,7 +424,7 @@ export class AtomicServiceSearch extends ViewPU { Row.justifyContent(FlexAlign.Center); Row.width(ATOMIC_SELECT_HEIGHT); Row.height(ATOMIC_SELECT_HEIGHT); - Row.margin({ right: OPERATION_ITEM1_MARGIN_RIGHT }); + Row.margin({ end: LengthMetrics.vp(OPERATION_ITEM1_MARGIN_RIGHT) }); Row.backgroundColor(this.isFunction1Pressed ? this.search?.pressedBackgroundColor : Color.Transparent); Row.onTouch((event) => { if (event && event.type === TouchType.Down) { @@ -467,7 +467,7 @@ export class AtomicServiceSearch extends ViewPU { Row.justifyContent(FlexAlign.Center); Row.width(ATOMIC_SERVICE_SEARCH_HEIGHT); Row.height(ATOMIC_SERVICE_SEARCH_HEIGHT); - Row.margin(OPERATION_ITEM2_MARGIN_LEFT); + Row.margin({ start: LengthMetrics.vp(OPERATION_ITEM2_MARGIN_LEFT) }); Row.backgroundColor(this.isFunction2Pressed ? this.search?.pressedBackgroundColor : this.search?.componentBackgroundColor); Row.onTouch((event) => { @@ -549,7 +549,7 @@ export class AtomicServiceSearch extends ViewPU { rerender() { this.updateDirtyElements(); } - + } export default { AtomicServiceSearch }; diff --git a/atomicservicesearch/source/atomicservicesearch.ets b/atomicservicesearch/source/atomicservicesearch.ets index 63d00d2..0362e0b 100644 --- a/atomicservicesearch/source/atomicservicesearch.ets +++ b/atomicservicesearch/source/atomicservicesearch.ets @@ -350,7 +350,7 @@ export struct AtomicServiceSearch { .justifyContent(FlexAlign.Center) .width(ATOMIC_SELECT_HEIGHT) .height(ATOMIC_SELECT_HEIGHT) - .margin({ right: OPERATION_ITEM1_MARGIN_RIGHT }) + .margin({ end: LengthMetrics.vp(OPERATION_ITEM1_MARGIN_RIGHT) }) .backgroundColor(this.isFunction1Pressed ? this.search?.pressedBackgroundColor : Color.Transparent) .onTouch((event?: TouchEvent) => { if (event && event.type === TouchType.Down) { @@ -379,7 +379,7 @@ export struct AtomicServiceSearch { .justifyContent(FlexAlign.Center) .width(ATOMIC_SERVICE_SEARCH_HEIGHT) .height(ATOMIC_SERVICE_SEARCH_HEIGHT) - .margin(OPERATION_ITEM2_MARGIN_LEFT) + .margin({ start: LengthMetrics.vp(OPERATION_ITEM2_MARGIN_LEFT) }) .backgroundColor(this.isFunction2Pressed ? this.search?.pressedBackgroundColor : this.search?.componentBackgroundColor) .onTouch((event?: TouchEvent) => { -- Gitee From d1ad02c2dabdfb7b1ff6f4a381040fb99d06a0be Mon Sep 17 00:00:00 2001 From: jiyu Date: Mon, 17 Feb 2025 12:13:16 +0000 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiyu --- .../interfaces/atomicservicesearch.js | 9 ++++----- atomicservicesearch/source/atomicservicesearch.ets | 14 ++++++-------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index b35b600..8c21986 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -41,7 +41,7 @@ const OPERATION_ITEM1_MARGIN_RIGHT = 2; const OPERATION_ITEM2_MARGIN_LEFT = 8; export class AtomicServiceSearch extends ViewPU { - + constructor(parent, params, __localStorage, elmtId = -1, paramsLambda = undefined, extraInfo) { super(parent, __localStorage, elmtId, extraInfo); if (typeof paramsLambda === 'function') { @@ -350,19 +350,18 @@ export class AtomicServiceSearch extends ViewPU { controller: this.controller }); Search.backgroundColor(Color.Transparent); - Search.searchButton(this.search?.searchButton?.value, this.search?.searchButton?.option); + Search.searchButton(this.search?.searchButton?.value, this.search?.searchButton?.options); Search.placeholderColor(this.search?.placeholderColor); Search.placeholderFont(this.search?.placeholderFont); Search.textFont(this.search?.textFont); Search.textAlign(this.search?.textAlign); - Search.copyOption(this.search?.copyOption); + Search.copyOption(this.search?.copyOptions); Search.searchIcon(this.search?.searchIcon); Search.cancelButton({ icon: this.search?.cancelIcon }); Search.fontColor(this.search?.fontColor); Search.caretStyle(this.search?.caretStyle); Search.enableKeyboardOnFocus(this.search?.enableKeyboardOnFocus); Search.selectionMenuHidden(this.search?.hideSelectionMenu); - Search.customKeyboard(null, { supportAvoidance: this.search?.avoidKeyboard }); Search.type(this.search?.type); Search.maxLength(this.search?.maxLength); Search.enterKeyType(this.search?.enterKeyType); @@ -549,7 +548,7 @@ export class AtomicServiceSearch extends ViewPU { rerender() { this.updateDirtyElements(); } - + } export default { AtomicServiceSearch }; diff --git a/atomicservicesearch/source/atomicservicesearch.ets b/atomicservicesearch/source/atomicservicesearch.ets index 0362e0b..089f4bc 100644 --- a/atomicservicesearch/source/atomicservicesearch.ets +++ b/atomicservicesearch/source/atomicservicesearch.ets @@ -48,10 +48,10 @@ export interface InputFilterOptions { export interface SearchButtonParams { value: string, - option?: SearchButtonOptions + options?: SearchButtonOptions } -export interface MenuAlignOption { +export interface MenuAlignOptions { alignType: MenuAlignType, offset?: Offset } @@ -76,7 +76,7 @@ export interface SelectOptions { optionHeight?: Dimension; space?: Length; arrowPosition?: ArrowPosition; - menuAlign?: MenuAlignOption; + menuAlign?: MenuAlignOptions; menuBackgroundColor?: ResourceColor; menuBackgroundBlurStyle?: BlurStyle; } @@ -89,14 +89,13 @@ export interface SearchOptions { placeholderFont?: Font; textFont?: Font; textAlign?: TextAlign; - copyOption?: CopyOptions; + copyOptions?: CopyOptions; searchIcon?: IconOptions | SymbolGlyphModifier; cancelIcon?: IconOptions; fontColor?: ResourceColor; caretStyle?: CaretStyle; enableKeyboardOnFocus?: boolean; hideSelectionMenu?: boolean; - avoidKeyboard?: boolean; type?: SearchType; maxLength?: number; enterKeyType?: EnterKeyType; @@ -276,19 +275,18 @@ export struct AtomicServiceSearch { controller: this.controller }) .backgroundColor(Color.Transparent) - .searchButton(this.search?.searchButton?.value, this.search?.searchButton?.option) + .searchButton(this.search?.searchButton?.value, this.search?.searchButton?.options) .placeholderColor(this.search?.placeholderColor) .placeholderFont(this.search?.placeholderFont) .textFont(this.search?.textFont) .textAlign(this.search?.textAlign) - .copyOption(this.search?.copyOption) + .copyOption(this.search?.copyOptions) .searchIcon(this.search?.searchIcon) .cancelButton({ icon: this.search?.cancelIcon }) .fontColor(this.search?.fontColor) .caretStyle(this.search?.caretStyle) .enableKeyboardOnFocus(this.search?.enableKeyboardOnFocus) .selectionMenuHidden(this.search?.hideSelectionMenu) - .customKeyboard(null, { supportAvoidance: this.search?.avoidKeyboard }) .type(this.search?.type) .maxLength(this.search?.maxLength) .enterKeyType(this.search?.enterKeyType) -- Gitee From 27fcddaedb1885b90295fa09249fa3c09dc37b16 Mon Sep 17 00:00:00 2001 From: jiyu Date: Mon, 17 Feb 2025 12:21:48 +0000 Subject: [PATCH 03/11] update atomicservicesearch Signed-off-by: jiyu --- atomicservicesearch/interfaces/atomicservicesearch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index 8c21986..13c2434 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -162,7 +162,7 @@ export class AtomicServiceSearch extends ViewPU { get isSearchPressed() { return this.__isSearchPressed.get(); } - + set isSearchPressed(newValue) { this.__isSearchPressed.set(newValue); } -- Gitee From 2bdf44c1df40f7f87253dd0aa6b8ffb808869868 Mon Sep 17 00:00:00 2001 From: jiyu Date: Tue, 18 Feb 2025 08:02:22 +0000 Subject: [PATCH 04/11] =?UTF-8?q?SelectOptions.value=E6=94=AF=E6=8C=81Reso?= =?UTF-8?q?urceStr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiyu --- atomicservicesearch/interfaces/atomicservicesearch.js | 2 +- atomicservicesearch/source/atomicservicesearch.ets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index 13c2434..f25206b 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -548,7 +548,7 @@ export class AtomicServiceSearch extends ViewPU { rerender() { this.updateDirtyElements(); } - + } export default { AtomicServiceSearch }; diff --git a/atomicservicesearch/source/atomicservicesearch.ets b/atomicservicesearch/source/atomicservicesearch.ets index 089f4bc..968fe1e 100644 --- a/atomicservicesearch/source/atomicservicesearch.ets +++ b/atomicservicesearch/source/atomicservicesearch.ets @@ -59,7 +59,7 @@ export interface MenuAlignOptions { export interface SelectOptions { options?: Array; selected?: number; - value?: string; + value?: ResourceStr; onSelect?: OnSelectCallback; controlSize?: ControlSize; menuItemContentModifier?: ContentModifier; -- Gitee From 12b175b00995740f0cc3c65d0706d82984a4b6a9 Mon Sep 17 00:00:00 2001 From: jiyu Date: Wed, 19 Feb 2025 07:31:07 +0000 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiyu --- .../interfaces/atomicservicesearch.js | 8 ++++---- .../source/atomicservicesearch.ets | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index f25206b..7aae1ea 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -276,7 +276,7 @@ export class AtomicServiceSearch extends ViewPU { }, Row); this.observeComponentCreation2((elmtId, isInitialRender) => { Select.create(this.select?.options); - Select.value(this.select?.value); + Select.value(this.select?.selectValue); Select.selected(this.select?.selected); Select.onSelect(this.select?.onSelect); Select.controlSize(this.select?.controlSize); @@ -350,7 +350,7 @@ export class AtomicServiceSearch extends ViewPU { controller: this.controller }); Search.backgroundColor(Color.Transparent); - Search.searchButton(this.search?.searchButton?.value, this.search?.searchButton?.options); + Search.searchButton(this.search?.searchButton?.searchButtonValue.toString(), this.search?.searchButton?.options); Search.placeholderColor(this.search?.placeholderColor); Search.placeholderFont(this.search?.placeholderFont); Search.textFont(this.search?.textFont); @@ -367,9 +367,9 @@ export class AtomicServiceSearch extends ViewPU { Search.enterKeyType(this.search?.enterKeyType); Search.decoration(this.search?.decoration); Search.letterSpacing(this.search?.letterSpacing); - Search.fontFeature(this.search?.fontFeature); + Search.fontFeature(this.search?.fontFeature?.toString()); Search.selectedBackgroundColor(this.search?.selectedBackgroundColor); - Search.inputFilter(this.search?.inputFilter?.value, this.search?.inputFilter?.error); + Search.inputFilter(this.search?.inputFilter?.inputFilterValue, this.search?.inputFilter?.error); Search.textIndent(this.search?.textIndent); Search.minFontSize(this.search?.minFontSize); Search.maxFontSize(this.search?.maxFontSize); diff --git a/atomicservicesearch/source/atomicservicesearch.ets b/atomicservicesearch/source/atomicservicesearch.ets index 968fe1e..f88f343 100644 --- a/atomicservicesearch/source/atomicservicesearch.ets +++ b/atomicservicesearch/source/atomicservicesearch.ets @@ -14,8 +14,8 @@ */ import { LengthMetrics, OperationOption } from '@kit.ArkUI'; -declare type OnSelectCallback = (index: number, value?: string) => void; -declare type OnPasteCallback = (value: string, event: PasteEvent) => void; +declare type OnSelectCallback = (index: number, selectValue?: string) => void; +declare type OnPasteCallback = (pasteValue: string, event: PasteEvent) => void; declare type OnTextSelectionChangeCallback = (selectionStart: number, selectionEnd: number) => void; declare type OnContentScrollCallback = (totalOffsetX: number, totalOffsetY: number) => void; @@ -42,12 +42,12 @@ const OPERATION_ITEM1_MARGIN_RIGHT: number = 2; const OPERATION_ITEM2_MARGIN_LEFT: number = 8; export interface InputFilterOptions { - value: ResourceStr, + inputFilterValue: ResourceStr, error?: Callback } export interface SearchButtonParams { - value: string, + searchButtonValue: ResourceStr, options?: SearchButtonOptions } @@ -59,7 +59,7 @@ export interface MenuAlignOptions { export interface SelectOptions { options?: Array; selected?: number; - value?: ResourceStr; + selectValue?: ResourceStr; onSelect?: OnSelectCallback; controlSize?: ControlSize; menuItemContentModifier?: ContentModifier; @@ -101,7 +101,7 @@ export interface SearchOptions { enterKeyType?: EnterKeyType; decoration?: TextDecorationOptions; letterSpacing?: number | string | Resource; - fontFeature?: string; + fontFeature?: ResourceStr; selectedBackgroundColor?: ResourceColor; inputFilter?: InputFilterOptions; textIndent?: Dimension; @@ -220,7 +220,7 @@ export struct AtomicServiceSearch { if (typeof this.select !== 'undefined' && typeof this.select.options !== 'undefined') { Row() { Select(this.select?.options) - .value(this.select?.value) + .value(this.select?.selectValue) .selected(this.select?.selected) .onSelect(this.select?.onSelect) .controlSize(this.select?.controlSize) @@ -275,7 +275,7 @@ export struct AtomicServiceSearch { controller: this.controller }) .backgroundColor(Color.Transparent) - .searchButton(this.search?.searchButton?.value, this.search?.searchButton?.options) + .searchButton(this.search?.searchButton?.searchButtonValue.toString(), this.search?.searchButton?.options) .placeholderColor(this.search?.placeholderColor) .placeholderFont(this.search?.placeholderFont) .textFont(this.search?.textFont) @@ -292,9 +292,9 @@ export struct AtomicServiceSearch { .enterKeyType(this.search?.enterKeyType) .decoration(this.search?.decoration) .letterSpacing(this.search?.letterSpacing) - .fontFeature(this.search?.fontFeature) + .fontFeature(this.search?.fontFeature?.toString()) .selectedBackgroundColor(this.search?.selectedBackgroundColor) - .inputFilter(this.search?.inputFilter?.value, this.search?.inputFilter?.error) + .inputFilter(this.search?.inputFilter?.inputFilterValue, this.search?.inputFilter?.error) .textIndent(this.search?.textIndent) .minFontSize(this.search?.minFontSize) .maxFontSize(this.search?.maxFontSize) -- Gitee From ab0be508b089279b2acebaa09899506300caec07 Mon Sep 17 00:00:00 2001 From: jiyu Date: Wed, 19 Feb 2025 12:09:27 +0000 Subject: [PATCH 06/11] update AtomicServiceSearch Signed-off-by: jiyu --- .../interfaces/atomicservicesearch.js | 6 +++--- .../source/atomicservicesearch.ets | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index 7aae1ea..80c5a0e 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -41,7 +41,7 @@ const OPERATION_ITEM1_MARGIN_RIGHT = 2; const OPERATION_ITEM2_MARGIN_LEFT = 8; export class AtomicServiceSearch extends ViewPU { - + constructor(parent, params, __localStorage, elmtId = -1, paramsLambda = undefined, extraInfo) { super(parent, __localStorage, elmtId, extraInfo); if (typeof paramsLambda === 'function') { @@ -182,7 +182,7 @@ export class AtomicServiceSearch extends ViewPU { set value(newValue) { this.__value.set(newValue); } - + get placeholder() { return this.__placeholder.get(); } @@ -548,7 +548,7 @@ export class AtomicServiceSearch extends ViewPU { rerender() { this.updateDirtyElements(); } - + } export default { AtomicServiceSearch }; diff --git a/atomicservicesearch/source/atomicservicesearch.ets b/atomicservicesearch/source/atomicservicesearch.ets index f88f343..6e360a7 100644 --- a/atomicservicesearch/source/atomicservicesearch.ets +++ b/atomicservicesearch/source/atomicservicesearch.ets @@ -41,7 +41,7 @@ const ICON_WIDTH_AND_HEIGTH: number = 24; const OPERATION_ITEM1_MARGIN_RIGHT: number = 2; const OPERATION_ITEM2_MARGIN_LEFT: number = 8; -export interface InputFilterOptions { +export interface InputFilterParams { inputFilterValue: ResourceStr, error?: Callback } @@ -51,12 +51,12 @@ export interface SearchButtonParams { options?: SearchButtonOptions } -export interface MenuAlignOptions { +export interface MenuAlignParams { alignType: MenuAlignType, offset?: Offset } -export interface SelectOptions { +export interface SelectParams { options?: Array; selected?: number; selectValue?: ResourceStr; @@ -76,12 +76,12 @@ export interface SelectOptions { optionHeight?: Dimension; space?: Length; arrowPosition?: ArrowPosition; - menuAlign?: MenuAlignOptions; + menuAlign?: MenuAlignParams; menuBackgroundColor?: ResourceColor; menuBackgroundBlurStyle?: BlurStyle; } -export interface SearchOptions { +export interface SearchParams { componentBackgroundColor?: ResourceColor; pressedBackgroundColor?: ResourceColor; searchButton?: SearchButtonParams; @@ -103,7 +103,7 @@ export interface SearchOptions { letterSpacing?: number | string | Resource; fontFeature?: ResourceStr; selectedBackgroundColor?: ResourceColor; - inputFilter?: InputFilterOptions; + inputFilter?: InputFilterParams; textIndent?: Dimension; minFontSize?: number | string | Resource; maxFontSize?: number | string | Resource; @@ -124,7 +124,7 @@ export interface SearchOptions { onDidDelete?: Callback; } -export interface OperationOptions { +export interface OperationParams { auxiliaryItem?: OperationOption; independentItem?: OperationOption; } @@ -137,8 +137,8 @@ export struct AtomicServiceSearch { @State private showImage: boolean = true; @Prop @Watch('onParamsChange') value?: ResourceStr = ''; @Prop placeholder?: ResourceStr = 'Search'; - @Prop @Watch('onSelectChange') select?: SelectOptions = {}; - @Prop @Watch('onSearchChange') search?: SearchOptions = { + @Prop @Watch('onSelectChange') select?: SelectParams = {}; + @Prop @Watch('onSearchChange') search?: SearchParams = { componentBackgroundColor: ATOMIC_SERVICE_SEARCH_BG_COLOR, placeholderFont: { size: TEXT_SIZE_BODY1, @@ -154,7 +154,7 @@ export struct AtomicServiceSearch { }, pressedBackgroundColor: EFFECT_COLOR }; - operation?: OperationOptions; + operation?: OperationParams; controller?: SearchController = new SearchController(); aboutToAppear(): void { -- Gitee From 8fbd34c71abd00b86bb85a633e369e54d494212b Mon Sep 17 00:00:00 2001 From: jiyu Date: Wed, 19 Feb 2025 12:11:32 +0000 Subject: [PATCH 07/11] update AtomicServiceSearch Signed-off-by: jiyu --- atomicservicesearch/interfaces/atomicservicesearch.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index 80c5a0e..4ad158a 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -41,7 +41,7 @@ const OPERATION_ITEM1_MARGIN_RIGHT = 2; const OPERATION_ITEM2_MARGIN_LEFT = 8; export class AtomicServiceSearch extends ViewPU { - + constructor(parent, params, __localStorage, elmtId = -1, paramsLambda = undefined, extraInfo) { super(parent, __localStorage, elmtId, extraInfo); if (typeof paramsLambda === 'function') { @@ -182,7 +182,7 @@ export class AtomicServiceSearch extends ViewPU { set value(newValue) { this.__value.set(newValue); } - + get placeholder() { return this.__placeholder.get(); } -- Gitee From 67e048e13db2eb64f5515672f2c4a90c3b540288 Mon Sep 17 00:00:00 2001 From: jiyu Date: Mon, 24 Feb 2025 12:23:49 +0000 Subject: [PATCH 08/11] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=90=8E=E4=BF=AE=E6=94=B9=E5=AE=9E=E7=8E=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiyu --- atomicservicesearch/interfaces/atomicservicesearch.js | 3 +-- atomicservicesearch/source/atomicservicesearch.ets | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index 4ad158a..60d5651 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -279,7 +279,6 @@ export class AtomicServiceSearch extends ViewPU { Select.value(this.select?.selectValue); Select.selected(this.select?.selected); Select.onSelect(this.select?.onSelect); - Select.controlSize(this.select?.controlSize); Select.menuItemContentModifier.bind(this)(this.select?.menuItemContentModifier); Select.divider(this.select?.divider); Select.font(this.select?.font); @@ -548,7 +547,7 @@ export class AtomicServiceSearch extends ViewPU { rerender() { this.updateDirtyElements(); } - + } export default { AtomicServiceSearch }; diff --git a/atomicservicesearch/source/atomicservicesearch.ets b/atomicservicesearch/source/atomicservicesearch.ets index 6e360a7..f66b9fa 100644 --- a/atomicservicesearch/source/atomicservicesearch.ets +++ b/atomicservicesearch/source/atomicservicesearch.ets @@ -1,4 +1,4 @@ -/* + /* * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ */ import { LengthMetrics, OperationOption } from '@kit.ArkUI'; -declare type OnSelectCallback = (index: number, selectValue?: string) => void; +declare type OnSelectCallback = (index: number, selectValue: string) => void; declare type OnPasteCallback = (pasteValue: string, event: PasteEvent) => void; declare type OnTextSelectionChangeCallback = (selectionStart: number, selectionEnd: number) => void; declare type OnContentScrollCallback = (totalOffsetX: number, totalOffsetY: number) => void; @@ -61,7 +61,6 @@ export interface SelectParams { selected?: number; selectValue?: ResourceStr; onSelect?: OnSelectCallback; - controlSize?: ControlSize; menuItemContentModifier?: ContentModifier; divider?: Optional | null; font?: Font; @@ -223,7 +222,6 @@ export struct AtomicServiceSearch { .value(this.select?.selectValue) .selected(this.select?.selected) .onSelect(this.select?.onSelect) - .controlSize(this.select?.controlSize) .menuItemContentModifier(this.select?.menuItemContentModifier) .divider(this.select?.divider) .font(this.select?.font) -- Gitee From b818c9a3bc6873db3d19d71949c3fc4174090362 Mon Sep 17 00:00:00 2001 From: jiyu Date: Wed, 26 Feb 2025 11:21:42 +0000 Subject: [PATCH 09/11] =?UTF-8?q?UX=E6=A3=80=E8=A7=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiyu --- .../interfaces/atomicservicesearch.js | 15 ++++++++++----- .../source/atomicservicesearch.ets | 11 ++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index 60d5651..0415902 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -31,7 +31,7 @@ const SELECT_MARGIN_LEFT = 2; const FLEX_SHRINK = 0; const DIVIDER_OPACITY = 0.5; const DIVIDER_MARGIN_LEFT = 2; -const DIVIDER_MARGIN_RIGHT = -2; +const DIVIDER_MARGIN_RIGHT = 0; const ATOMIC_SERVICE_SEARCH_HEIGHT = 40; const ATOMIC_SELECT_HEIGHT = 36; const ATOMIC_SELECT_BORDER_RADIUS = 20; @@ -39,6 +39,7 @@ const ATOMIC_DIVIDER_HEIGHT = 20; const ICON_WIDTH_AND_HEIGTH = 24; const OPERATION_ITEM1_MARGIN_RIGHT = 2; const OPERATION_ITEM2_MARGIN_LEFT = 8; +const SEARCH_OFFSET_X = -5; export class AtomicServiceSearch extends ViewPU { @@ -150,7 +151,7 @@ export class AtomicServiceSearch extends ViewPU { set isFunction1Pressed(newValue) { this.__isFunction1Pressed.set(newValue); } - + get isFunction2Pressed() { return this.__isFunction2Pressed.get(); } @@ -182,7 +183,7 @@ export class AtomicServiceSearch extends ViewPU { set value(newValue) { this.__value.set(newValue); } - + get placeholder() { return this.__placeholder.get(); } @@ -227,10 +228,13 @@ export class AtomicServiceSearch extends ViewPU { initSelectStyle() { if (typeof this.select !== 'undefined') { + if (typeof this.select.selected === 'undefined') { + this.select.selected = -1; + } if (typeof this.select.font === 'undefined') { this.select.font = { size: TEXT_SIZE_BODY1 }; } - if (typeof this.select.fontColor !== 'undefined') { + if (typeof this.select.fontColor === 'undefined') { this.select.fontColor = TEXT_COLOR_PRIMARY; } } @@ -348,6 +352,7 @@ export class AtomicServiceSearch extends ViewPU { placeholder: this.placeholder, controller: this.controller }); + Search.margin({ left: SEARCH_OFFSET_X }); Search.backgroundColor(Color.Transparent); Search.searchButton(this.search?.searchButton?.searchButtonValue.toString(), this.search?.searchButton?.options); Search.placeholderColor(this.search?.placeholderColor); @@ -547,7 +552,7 @@ export class AtomicServiceSearch extends ViewPU { rerender() { this.updateDirtyElements(); } - + } export default { AtomicServiceSearch }; diff --git a/atomicservicesearch/source/atomicservicesearch.ets b/atomicservicesearch/source/atomicservicesearch.ets index f66b9fa..449590d 100644 --- a/atomicservicesearch/source/atomicservicesearch.ets +++ b/atomicservicesearch/source/atomicservicesearch.ets @@ -1,4 +1,4 @@ - /* +/* * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ const SELECT_MARGIN_LEFT: number = 2; const FLEX_SHRINK: number = 0; const DIVIDER_OPACITY: number = 0.5; const DIVIDER_MARGIN_LEFT: number = 2; -const DIVIDER_MARGIN_RIGHT: number = -2; +const DIVIDER_MARGIN_RIGHT: number = 0; const ATOMIC_SERVICE_SEARCH_HEIGHT: number = 40; const ATOMIC_SELECT_HEIGHT: number = 36; const ATOMIC_SELECT_BORDER_RADIUS: number = 20; @@ -40,6 +40,7 @@ const ATOMIC_DIVIDER_HEIGHT: number = 20; const ICON_WIDTH_AND_HEIGTH: number = 24; const OPERATION_ITEM1_MARGIN_RIGHT: number = 2; const OPERATION_ITEM2_MARGIN_LEFT: number = 8; +const SEARCH_OFFSET_X: number = -5; export interface InputFilterParams { inputFilterValue: ResourceStr, @@ -176,10 +177,13 @@ export struct AtomicServiceSearch { private initSelectStyle(): void { if (typeof this.select !== 'undefined') { + if (typeof this.select.selected === 'undefined') { + this.select.selected = -1; + } if (typeof this.select.font === 'undefined') { this.select.font = { size: TEXT_SIZE_BODY1 }; } - if (typeof this.select.fontColor !== 'undefined') { + if (typeof this.select.fontColor === 'undefined') { this.select.fontColor = TEXT_COLOR_PRIMARY; } } @@ -272,6 +276,7 @@ export struct AtomicServiceSearch { placeholder: this.placeholder, controller: this.controller }) + .margin({ left: SEARCH_OFFSET_X }) .backgroundColor(Color.Transparent) .searchButton(this.search?.searchButton?.searchButtonValue.toString(), this.search?.searchButton?.options) .placeholderColor(this.search?.placeholderColor) -- Gitee From 9b1e1ddf0e7db13c094c4a9bd2ed86d6de0fbff4 Mon Sep 17 00:00:00 2001 From: jiyu Date: Wed, 26 Feb 2025 11:23:46 +0000 Subject: [PATCH 10/11] =?UTF-8?q?UX=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiyu --- atomicservicesearch/interfaces/atomicservicesearch.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index 0415902..7df39c7 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -151,7 +151,7 @@ export class AtomicServiceSearch extends ViewPU { set isFunction1Pressed(newValue) { this.__isFunction1Pressed.set(newValue); } - + get isFunction2Pressed() { return this.__isFunction2Pressed.get(); } @@ -183,7 +183,7 @@ export class AtomicServiceSearch extends ViewPU { set value(newValue) { this.__value.set(newValue); } - + get placeholder() { return this.__placeholder.get(); } -- Gitee From bb0b161790cfeddb90dc0e202e73252981e0a74c Mon Sep 17 00:00:00 2001 From: jiyu Date: Thu, 27 Feb 2025 12:00:21 +0000 Subject: [PATCH 11/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0SearchKey=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=B9=E8=B7=9D=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E4=B8=8A=E5=B1=8F=E6=97=B6=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiyu --- .../interfaces/atomicservicesearch.js | 14 ++++++++++---- atomicservicesearch/source/atomicservicesearch.ets | 10 ++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/atomicservicesearch/interfaces/atomicservicesearch.js b/atomicservicesearch/interfaces/atomicservicesearch.js index 7df39c7..b7c62bf 100644 --- a/atomicservicesearch/interfaces/atomicservicesearch.js +++ b/atomicservicesearch/interfaces/atomicservicesearch.js @@ -352,7 +352,8 @@ export class AtomicServiceSearch extends ViewPU { placeholder: this.placeholder, controller: this.controller }); - Search.margin({ left: SEARCH_OFFSET_X }); + Search.key(this.search?.searchKey?.toString()); + Search.margin({ start: LengthMetrics.vp(SEARCH_OFFSET_X) }); Search.backgroundColor(Color.Transparent); Search.searchButton(this.search?.searchButton?.searchButtonValue.toString(), this.search?.searchButton?.options); Search.placeholderColor(this.search?.placeholderColor); @@ -396,10 +397,15 @@ export class AtomicServiceSearch extends ViewPU { Search.onContentScroll(this.search?.onContentScroll); Search.onTextSelectionChange(this.search?.onTextSelectionChange); Search.onChange((value, previewText) => { + if (previewText?.value.length !== 0) { + this.value = previewText?.value; + } + else { + this.value = value; + } if (typeof this.search?.onChange !== 'undefined') { this.search?.onChange(value, previewText); } - this.value = value; }); Search.onTouch((event) => { if (event && event.type === TouchType.Down) { @@ -548,11 +554,11 @@ export class AtomicServiceSearch extends ViewPU { Flex.pop(); Row.pop(); } - + rerender() { this.updateDirtyElements(); } - + } export default { AtomicServiceSearch }; diff --git a/atomicservicesearch/source/atomicservicesearch.ets b/atomicservicesearch/source/atomicservicesearch.ets index 449590d..285a761 100644 --- a/atomicservicesearch/source/atomicservicesearch.ets +++ b/atomicservicesearch/source/atomicservicesearch.ets @@ -82,6 +82,7 @@ export interface SelectParams { } export interface SearchParams { + searchKey?: ResourceStr; componentBackgroundColor?: ResourceColor; pressedBackgroundColor?: ResourceColor; searchButton?: SearchButtonParams; @@ -276,7 +277,8 @@ export struct AtomicServiceSearch { placeholder: this.placeholder, controller: this.controller }) - .margin({ left: SEARCH_OFFSET_X }) + .key(this.search?.searchKey?.toString()) + .margin({ start: LengthMetrics.vp(SEARCH_OFFSET_X) }) .backgroundColor(Color.Transparent) .searchButton(this.search?.searchButton?.searchButtonValue.toString(), this.search?.searchButton?.options) .placeholderColor(this.search?.placeholderColor) @@ -320,10 +322,14 @@ export struct AtomicServiceSearch { .onContentScroll(this.search?.onContentScroll) .onTextSelectionChange(this.search?.onTextSelectionChange) .onChange((value: string, previewText?: PreviewText) => { + if (previewText?.value.length !== 0) { + this.value = previewText?.value; + } else { + this.value = value; + } if (typeof this.search?.onChange !== 'undefined') { this.search?.onChange(value, previewText); } - this.value = value; }) .onTouch((event?: TouchEvent) => { if (event && event.type === TouchType.Down) { -- Gitee