From 2c8a9037fa93ef245d797466411c9aa841aed79b Mon Sep 17 00:00:00 2001
From: RickCole21 <rickcole21@outlook.com>
Date: Wed, 26 Feb 2020 12:35:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?form=E4=B8=8Bservice=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderers/Form/Service.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/renderers/Form/Service.tsx b/src/renderers/Form/Service.tsx
index 4fe85d058..a804f2534 100644
--- a/src/renderers/Form/Service.tsx
+++ b/src/renderers/Form/Service.tsx
@@ -8,7 +8,7 @@ import {observer} from 'mobx-react';
 import {ServiceStore, IServiceStore} from '../../store/service';
 
 @Renderer({
-  test: /(^|\/)form\/(.*)\/service$/,
+  test: /(^|\/)form(?:\/.+)?\/control\/service$/,
   weight: -100,
   storeType: ServiceStore.name,
   storeExtendsData: false,
@@ -64,10 +64,10 @@ export class ServiceRenderer extends BasicService {
 
     const finnalSchema = store.schema ||
       schema || {
-        controls,
-        tabs,
-        feildSet
-      };
+      controls,
+      tabs,
+      feildSet
+    };
     if (
       finnalSchema &&
       !finnalSchema.type &&

From 5b82492d5b727abd3bbe5e97fd141b4263f8db81 Mon Sep 17 00:00:00 2001
From: RickCole21 <rickcole21@outlook.com>
Date: Wed, 26 Feb 2020 13:26:27 +0800
Subject: [PATCH 2/2] fix regexp

---
 src/renderers/Form/Service.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderers/Form/Service.tsx b/src/renderers/Form/Service.tsx
index a804f2534..30b882c02 100644
--- a/src/renderers/Form/Service.tsx
+++ b/src/renderers/Form/Service.tsx
@@ -8,7 +8,7 @@ import {observer} from 'mobx-react';
 import {ServiceStore, IServiceStore} from '../../store/service';
 
 @Renderer({
-  test: /(^|\/)form(?:\/.+)?\/control\/service$/,
+  test: /(^|\/)form(?:\/.+)?\/control\/(?:\d+\/)?service$/,
   weight: -100,
   storeType: ServiceStore.name,
   storeExtendsData: false,