diff --git a/api/@internal/component/ets/index-full.d.ts b/api/@internal/component/ets/index-full.d.ts index ba50d08873b44a39d66bc756de705a2b5193d9f4..242315447546902d7ce24a4da05f85e4ec587a5f 100644 --- a/api/@internal/component/ets/index-full.d.ts +++ b/api/@internal/component/ets/index-full.d.ts @@ -64,7 +64,6 @@ /// /// /// -/// /// /// /// diff --git a/build-tools/arkui_transformer/config/arkui_config.json b/build-tools/arkui_transformer/config/arkui_config.json index 890f2d737fd052f0b1f76ff5a6b231b7ea6bc02e..78b303b561cfd6e35af1e0e3ded553002b8eb70f 100644 --- a/build-tools/arkui_transformer/config/arkui_config.json +++ b/build-tools/arkui_transformer/config/arkui_config.json @@ -119,7 +119,6 @@ "WaterFlow", "FlowItem", "ImageSpan", - "LocationButton", "PasteButton", "SaveButton", "UIExtensionComponent", diff --git a/build-tools/dts_parser/kit.json b/build-tools/dts_parser/kit.json index 90e6c5be1eeb0b1771b492c7e3ce4988969d8381..b617a7b7c4040c20e0c427840bd6b3476ca81f57 100644 --- a/build-tools/dts_parser/kit.json +++ b/build-tools/dts_parser/kit.json @@ -59,7 +59,6 @@ { "filePath": "@internal/component/ets/list_item.d.ts", "kitName": "ArkUI", "subSystem": "ArkUI开发框架" }, { "filePath": "@internal/component/ets/list_item_group.d.ts", "kitName": "ArkUI", "subSystem": "ArkUI开发框架" }, { "filePath": "@internal/component/ets/loading_progress.d.ts", "kitName": "ArkUI", "subSystem": "ArkUI开发框架" }, - { "filePath": "@internal/component/ets/location_button.d.ts", "kitName": "ArkUI", "subSystem": "ArkUI开发框架" }, { "filePath": "@internal/component/ets/marquee.d.ts", "kitName": "ArkUI", "subSystem": "ArkUI开发框架" }, { "filePath": "@internal/component/ets/matrix2d.d.ts", "kitName": "ArkUI", "subSystem": "ArkUI开发框架" }, { "filePath": "@internal/component/ets/media_cached_image.d.ts", "kitName": "ArkUI", "subSystem": "ArkUI开发框架" }, diff --git a/kits/@kit.ArkTS.d.ets b/kits/@kit.ArkTS.d.ets deleted file mode 100644 index 9f99ee05bbfb57a451f7e9a23e9b579b230cfdf2..0000000000000000000000000000000000000000 --- a/kits/@kit.ArkTS.d.ets +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2022-2023 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file - * @kit ArkTS - * @arkts 1.2 - */ - -import buffer from '@ohos.buffer'; -import uri from '@ohos.uri'; -import url from '@ohos.url'; -import ArrayList from '@ohos.util.ArrayList'; -import util from '@ohos.util'; -import Deque from '@ohos.util.Deque'; -import LightWeightMap from '@ohos.util.LightWeightMap'; -import Queue from '@ohos.util.Queue'; -import stream from '@ohos.util.stream'; -import HashMap from '@ohos.util.HashMap'; -import HashSet from '@ohos.util.HashSet'; -import LightWeightSet from '@ohos.util.LightWeightSet'; -import LinkedList from '@ohos.util.LinkedList'; -import List from '@ohos.util.List'; -import PlainArray from '@ohos.util.PlainArray'; -import Stack from '@ohos.util.Stack'; -import TreeMap from '@ohos.util.TreeMap'; -import TreeSet from '@ohos.util.TreeSet'; -import xml from '@ohos.xml'; -import transfer from '@ohos.transfer'; -import collections from '@arkts.collections'; -import Decimal from '@arkts.math.Decimal'; - -export { - ArrayList, Deque, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, - PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, stream, xml, transfer, collections, Decimal -}; diff --git a/kits/@kit.ArkTS.d.ts b/kits/@kit.ArkTS.d.ts index bc31b0b4ee03a20f3b7274814649e3bdefe078b5..3f75bbbd2ada9f972bd1eecbc0303ecc1c49c633 100644 --- a/kits/@kit.ArkTS.d.ts +++ b/kits/@kit.ArkTS.d.ts @@ -18,26 +18,36 @@ * @kit ArkTS */ +/* 共用部分*/ +/*** if arkts 1.1&1.2 */ import buffer from '@ohos.buffer'; -import convertxml from '@ohos.convertxml'; -import process from '@ohos.process'; -import taskpool from '@ohos.taskpool'; import uri from '@ohos.uri'; import url from '@ohos.url'; import ArrayList from '@ohos.util.ArrayList'; import util from '@ohos.util'; import Deque from '@ohos.util.Deque'; +import LightWeightMap from '@ohos.util.LightWeightMap'; +import Queue from '@ohos.util.Queue'; +import JSON from '@ohos.util.json'; +import stream from '@ohos.util.stream'; import HashMap from '@ohos.util.HashMap'; import HashSet from '@ohos.util.HashSet'; -import LightWeightMap from '@ohos.util.LightWeightMap'; import LightWeightSet from '@ohos.util.LightWeightSet'; import LinkedList from '@ohos.util.LinkedList'; import List from '@ohos.util.List'; import PlainArray from '@ohos.util.PlainArray'; -import Queue from '@ohos.util.Queue'; import Stack from '@ohos.util.Stack'; import TreeMap from '@ohos.util.TreeMap'; import TreeSet from '@ohos.util.TreeSet'; +import xml from '@ohos.xml'; +import collections from '@arkts.collections'; +import Decimal from '@arkts.math.Decimal'; +/*** endif */ + +/* 1.1独有部分 */ +import convertxml from '@ohos.convertxml'; +import process from '@ohos.process'; +import taskpool from '@ohos.taskpool'; import Vector from '@ohos.util.Vector'; import fastbuffer from '@ohos.fastbuffer'; import worker, { @@ -45,14 +55,8 @@ import worker, { MessageEvent, MessageEvents, PostMessageOptions, ThreadWorkerGlobalScope, WorkerEventListener, WorkerEventTarget, WorkerOptions, ThreadWorkerPriority } from '@ohos.worker'; -import xml from '@ohos.xml'; -import JSON from '@ohos.util.json'; import lang from '@arkts.lang'; import ArkTSUtils from '@arkts.utils'; -import collections from '@arkts.collections'; -import stream from '@ohos.util.stream'; -import Decimal from '@arkts.math.Decimal'; - export { ArrayList, convertxml, DedicatedWorkerGlobalScope, Deque, ErrorEvent, Event, EventListener, EventTarget, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, MessageEvent, @@ -60,3 +64,12 @@ export { TreeSet, Vector, WorkerEventListener, WorkerEventTarget, WorkerOptions, ThreadWorkerPriority, buffer, process, taskpool, uri, url, util, worker, xml, JSON, lang, ArkTSUtils, collections, stream, Decimal, fastbuffer }; + +/* 1.2独有部分 */ +/*** if arkts 1.2 */ +import transfer from '@ohos.transfer'; +export { + ArrayList, Deque, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, + PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, JSON, stream, xml, transfer, collections, Decimal +}; +/*** endif */ \ No newline at end of file