diff --git a/aafwk/aafwk_standard/formmanager/BUILD.gn b/aafwk/aafwk_standard/formmanager/BUILD.gn
index 774dde1214ccce8a97b6e619f9699f8d85415a83..b1f83cc8f197dadd99917edac6ee40cbdee3bb26 100644
--- a/aafwk/aafwk_standard/formmanager/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/BUILD.gn
@@ -22,10 +22,10 @@ group("formmanager") {
       "formhostst_ets/formsystemhostg:FormSystemHostG",
       "formhostst_ets/formsystemhostk:FormSystemHostK",
       "formhostst_ets/formsystemhostl:FormSystemHostL",
-      "formhostst_ets/formsystemhosto:FormSystemHostO",
-      "formhostst_ets/formsystemhostp:FormSystemHostP",
       "formhostst_ets/formsystemhostn:FormSystemHostN",
       "formhostst_ets/formsystemhostnoperm:FormSystemHostNoPerm",
+      "formhostst_ets/formsystemhosto:FormSystemHostO",
+      "formhostst_ets/formsystemhostp:FormSystemHostP",
       "formproviderst_ets/formsupplyapplicationA:FormSupplyAppA",
       "formproviderst_ets/formsupplyapplicationB:FormSupplyAppB",
       "formproviderst_ets/formsupplyapplicationD:FormSupplyAppD",
diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/BUILD.gn b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/BUILD.gn
index ece645b78c24db5f581b77d415e34f110fbe47b8..d9128314a02104ff6a2018c1d60ab69d38384cf4 100644
--- a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormSystemHostC") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormSystemHostC"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormSystemHostC") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormSystemHostC"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/BUILD.gn b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/BUILD.gn
index 63fafc6256f2a79c68907373323b0ac1505a3d82..e8de20fcdc7fc8bd480b936628eaeb50d2c8649c 100644
--- a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormSystemHostF") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormSystemHostF"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormSystemHostF") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormSystemHostF"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/BUILD.gn b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/BUILD.gn
index 5a9810b8824918d7501d18e0fe1a715547ae5c61..a4cec6e6f4b2c9d988ca269ca7191867267d2c2b 100644
--- a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormSystemHostG") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormSystemHostG"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormSystemHostG") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormSystemHostG"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/BUILD.gn b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/BUILD.gn
index b15e2de561a471f061dc7804857ef15982d26131..fcf084568f352b8efec14a5602fd987a28d5866e 100644
--- a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormSystemHostN") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormSystemHostN"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormSystemHostN") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormSystemHostN"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/BUILD.gn b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/BUILD.gn
index 4d4cce970a6e007b22f62a36699c0f8258cf6f37..ee371aeacba39f85e0b03f6aaa76189854c8aaf8 100644
--- a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormSystemHostNoPerm") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormSystemHostNoPerm"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormSystemHostNoPerm") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormSystemHostNoPerm"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/BUILD.gn b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/BUILD.gn
index 31d0fa976bb7c8efe17a025d958ae5f1cb293208..2cb109dd4c7513203d2b00d55089e85b16af1d89 100644
--- a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormSystemHostO") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormSystemHostO"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormSystemHostO") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormSystemHostO"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/BUILD.gn b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/BUILD.gn
index 5b4ec682342c99659538510e7cc5a15ae3f0f352..f19869313ea49f1571f35bbfa46654eb752e86be 100644
--- a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormSystemHostP") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormSystemHostP"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormSystemHostP") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormSystemHostP"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/BUILD.gn b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/BUILD.gn
index a5c2706b12d23fdb157541f3d50a140fb51f9bf9..9c8cb85d5036f203487c03c32261cb6fa7e6e3e2 100644
--- a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/BUILD.gn
@@ -16,8 +16,8 @@ import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("FormSupplyAppA") {
   hap_profile = "entry/src/main/config.json"
   deps = [
-    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_form_js_assets",
+    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_resources",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
@@ -39,8 +39,6 @@ ohos_js_assets("FormOfFaEts_form_js_assets") {
 }
 
 ohos_resources("FormOfFaEts_resources") {
-  sources = [
-    "entry/src/main/resources",
-  ]
+  sources = [ "entry/src/main/resources" ]
   hap_profile = "entry/src/main/config.json"
 }
diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/BUILD.gn b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/BUILD.gn
index d46c3156319b8a1036e9d0cd60d78d99d22a29bd..b1e630961e24dbc62310cc53b9a554a7bdff3dd5 100644
--- a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/BUILD.gn
@@ -16,8 +16,8 @@ import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("FormSupplyAppB") {
   hap_profile = "entry/src/main/config.json"
   deps = [
-    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_form_js_assets",
+    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_resources",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
@@ -39,8 +39,6 @@ ohos_js_assets("FormOfFaEts_form_js_assets") {
 }
 
 ohos_resources("FormOfFaEts_resources") {
-  sources = [
-    "entry/src/main/resources",
-  ]
+  sources = [ "entry/src/main/resources" ]
   hap_profile = "entry/src/main/config.json"
 }
diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/BUILD.gn b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/BUILD.gn
index ed8743d8a7bd30e5e9e7b5a6f3132ce88f8f77f5..a7dd39bf3de61f8322f48a05d6b80d83172233b7 100644
--- a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/BUILD.gn
@@ -16,8 +16,8 @@ import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("FormSupplyAppD") {
   hap_profile = "entry/src/main/config.json"
   deps = [
-    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_form_js_assets",
+    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_resources",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
@@ -39,8 +39,6 @@ ohos_js_assets("FormOfFaEts_form_js_assets") {
 }
 
 ohos_resources("FormOfFaEts_resources") {
-  sources = [
-    "entry/src/main/resources",
-  ]
+  sources = [ "entry/src/main/resources" ]
   hap_profile = "entry/src/main/config.json"
 }
diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/BUILD.gn b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/BUILD.gn
index fbbf21499a805600755634f49f137eeed5294fd9..95ed0796b91884d1bb4418c235b27646d2646a3d 100644
--- a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/BUILD.gn
@@ -16,8 +16,8 @@ import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("FormSupplyAppE") {
   hap_profile = "entry/src/main/config.json"
   deps = [
-    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_form_js_assets",
+    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_resources",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
@@ -39,8 +39,6 @@ ohos_js_assets("FormOfFaEts_form_js_assets") {
 }
 
 ohos_resources("FormOfFaEts_resources") {
-  sources = [
-    "entry/src/main/resources",
-  ]
+  sources = [ "entry/src/main/resources" ]
   hap_profile = "entry/src/main/config.json"
 }
diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/BUILD.gn b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/BUILD.gn
index 6e07ab1c7cd120bedcb1a7d4eb0433a63de45953..92bf3940f099c960003a1ecdc9c241e1412c6206 100644
--- a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/BUILD.gn
@@ -16,8 +16,8 @@ import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("FormSupplyAppH") {
   hap_profile = "entry/src/main/config.json"
   deps = [
-    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_form_js_assets",
+    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_resources",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
@@ -39,8 +39,6 @@ ohos_js_assets("FormOfFaEts_form_js_assets") {
 }
 
 ohos_resources("FormOfFaEts_resources") {
-  sources = [
-    "entry/src/main/resources",
-  ]
+  sources = [ "entry/src/main/resources" ]
   hap_profile = "entry/src/main/config.json"
 }
diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn
index da590e0cb5ee345d05d59ce68b8108c6bebbed57..6f103f4a2cd05645264b77eb5c4bd6770df32da1 100644
--- a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn
@@ -16,8 +16,8 @@ import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("FormSupplyAppNS") {
   hap_profile = "entry/src/main/config.json"
   deps = [
-    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_form_js_assets",
+    ":FormOfFaEts_js_assets",
     ":FormOfFaEts_resources",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
@@ -39,8 +39,6 @@ ohos_js_assets("FormOfFaEts_form_js_assets") {
 }
 
 ohos_resources("FormOfFaEts_resources") {
-  sources = [
-    "entry/src/main/resources",
-  ]
+  sources = [ "entry/src/main/resources" ]
   hap_profile = "entry/src/main/config.json"
 }
diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/BUILD.gn b/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/BUILD.gn
index 7cae731937a6d74408b207a97fcf53aaefc2fc0f..07806903ba0e655ef1d0f11ef82a2c945b608d31 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormStateDisableTest") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormStateDisableTest"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormStateDisableTest") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormStateDisableTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/BUILD.gn b/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/BUILD.gn
index 15abc92016a419027bde68fddce940a3b6b0ad7e..55ea97b27b1c070786607f7b766cc474fe3ef2fa 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormStateEnableTest") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormStateEnableTest"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormStateEnableTest") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormStateEnableTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn b/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn
index 485e46d098aad0ca6d4693d78d83e0a2e00e5465..5030bc71b9ace589ff82276ed292995bf3bd3ea0 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormStateNotifyInvisibleTest") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormStateNotifyInvisibleTest"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormStateNotifyInvisibleTest") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormStateNotifyInvisibleTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn b/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn
index 822d69e2794d1c4b70edf28e364f18c71327c842..ca89869b71f573dc5ec998b200b063ac83574af9 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormStateNotifyInvisibleTest2") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormStateNotifyInvisibleTest2"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormStateNotifyInvisibleTest2") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormStateNotifyInvisibleTest2"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}
diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn b/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn
index 8bc8aa24b4d2f40d50176decba933ece4a1ca12d..b80127f2497c2480664e4d036fcf3460e2fa314d 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn
@@ -1,32 +1,32 @@
-# Copyright (c) 2021 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
+# Copyright (c) 2021 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.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("FormStateNotifyVisibleTest") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FormStateNotifyVisibleTest"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FormStateNotifyVisibleTest") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FormStateNotifyVisibleTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}