diff --git a/abc.json b/abc.json
index 06a1bce22a227ad9e820ea812cfe2c7a41ffc66d..546a0fd352ea63812f7be44cd51bb2a1845256c5 100644
--- a/abc.json
+++ b/abc.json
@@ -4,7 +4,7 @@
         "command": {
             "cmd": [
                 "pnpm install",
-                "pnpm build",
+                "pnpm build:tone",
                 "mv ./dist $BUILD_DEST"
             ]
         }
diff --git a/package.json b/package.json
index 24b4a6987a1598549c00a85f62db8bc8f30b477c..4595d3b1906646e04185d04ece3b859056b11616 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tone-front",
-    "version": "1.18.0",
+    "version": "1.19.0",
     "private": true,
     "description": "Tone front",
     "scripts": {
diff --git a/src/app.tsx b/src/app.tsx
index 39700ab225eb4308c9e2ad81519e3f75e01485a9..095287b87e61a7e4749ff6e683ee873d91dcd4a2 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -101,7 +101,7 @@ export async function getInitialState(): Promise<any> {
                 redirectErrorPage(401)
                 return baseAppState
             }
-            const ws: any = await enterWsAndGetList(ws_id)
+            const ws: any = await enterWsAndGetList(ws_id) || {}
             if (ws?.first_entry) {
                 history.push(`/ws/${ws_id}/workspace/initSuccess`)
             }
diff --git a/src/components/Header/components/HeaderDropdown.tsx b/src/components/Header/components/HeaderDropdown.tsx
index 40e90da7fef1432efd06b9ee5069ebdb8bd3732e..9bf4a31a86cca9d2620f99ea3ee22eb19bdba956 100644
--- a/src/components/Header/components/HeaderDropdown.tsx
+++ b/src/components/Header/components/HeaderDropdown.tsx
@@ -93,7 +93,7 @@ export const HearderDropdown: React.FC<any> = (props) => {
 
     const current = React.useMemo(() => {
         if (!wsList) return {}
-        const [workspace] = wsList?.data?.filter(({ id }: any) => id === ws_id)
+        const [workspace] = (wsList?.data || [])?.filter(({ id }: any) => id === ws_id) // wsList?.data?.filter(({ id }: any) => id === ws_id)
         if (workspace) return workspace
         return {}
     }, [wsList, ws_id])
diff --git a/src/components/Header/components/JobModal.tsx b/src/components/Header/components/JobModal.tsx
index a159523b9f8deb4d9f19da208b91609ff7caaaa9..ac027f7cdc2e0303e8a6b17ca89161f401e747d9 100644
--- a/src/components/Header/components/JobModal.tsx
+++ b/src/components/Header/components/JobModal.tsx
@@ -15,7 +15,7 @@ const JobTemplateModal: React.FC<Record<string, any>> = (props) => {
     const dataSourceCopy = props.getData(jobTemplates)
 
     return (
-        <Layout.Content style={{ minWidth: 468, maxWidth: 912, paddingBottom: 8 }} key={props.testType}>
+        <Layout.Content style={{ minWidth: 468, maxWidth: 912, paddingBottom: 8 }}>
             <Row style={{ paddingLeft: 20, paddingRight: 19, marginBottom: 16 }}>
                 <Input
                     autoComplete="off"
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
index d9d1a663d71d89b5db1af44522adb74c99d97a0f..168ba723b06ec446e265c208aab89377ebadb55e 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
@@ -1117,7 +1117,7 @@ const NewMachine: React.FC<any> = (props) => {
                             </Form.Item>
                         </Col>
 
-                        {!is_instance && BUILD_APP_ENV === 'openanolis' &&
+                        {!is_instance && BUILD_APP_ENV !== 'opensource' &&
                             <Col span={12} className={styles.warp}>
                                 <Form.Item
                                     name="mode"
@@ -1125,7 +1125,9 @@ const NewMachine: React.FC<any> = (props) => {
                                     rules={[{ required: false, message: formatMessage({ id: 'please.select' }) }]}
                                 >
                                     <Radio.Group>
-                                        <Radio value={'active'} disabled><FormattedMessage id="device.active.mode" /></Radio>
+                                        {BUILD_APP_ENV === 'openanolis' &&
+                                            <Radio value={'active'} disabled><FormattedMessage id="device.active.mode" /></Radio>
+                                        }
                                         <Radio value={'passive'}><FormattedMessage id="device.passive.mode" /></Radio>
                                     </Radio.Group>
                                 </Form.Item>
diff --git a/src/pages/WorkSpace/DeviceManage/locales/en-US.ts b/src/pages/WorkSpace/DeviceManage/locales/en-US.ts
index c2ddbdf82ff2d6bb42da90ba785a083a60734c71..31c912faec053baa84899c6d5a9be18888985d33 100644
--- a/src/pages/WorkSpace/DeviceManage/locales/en-US.ts
+++ b/src/pages/WorkSpace/DeviceManage/locales/en-US.ts
@@ -155,8 +155,8 @@ export default {
   'device.extended.fields': 'Extended Fields',
   'device.aliyun.params': 'Alibaba Cloud openAPI parameters',
   'device.toneagent.working.mode': 'Toneagent working mode',
-  'device.active.mode': 'Active mode',
-  'device.passive.mode': 'Passive mode',
+  'device.active.mode': 'Active',
+  'device.passive.mode': 'Passive',
   'device.tips': 'Tips',
   'device.delete.config': 'Are you sure you want to delete the configuration ({data})？',
   'device.delete.instance': 'Are you sure you want to delete the instance({data})？',
diff --git a/src/utils/hooks.tsx b/src/utils/hooks.tsx
index 61198b72c95a4697300bda83478cfc4f8746cecb..d06795f8ff610efd9853b0b32a451393438b85cd 100644
--- a/src/utils/hooks.tsx
+++ b/src/utils/hooks.tsx
@@ -10,7 +10,7 @@ const { document, location }: any = window
 
 export const enterWsAndGetList = async (ws_id: any) => {
     try {
-        const { data } = await enterWorkspaceHistroy({ ws_id })
+        const { data } = await enterWorkspaceHistroy({ ws_id }) || {}
         const { code, ...historyWorkspaces } = await queryWorkspaceHistory({
             page_num: 1,
             page_size: 20,
diff --git a/src/wrappers/WorkspaceAuth.tsx b/src/wrappers/WorkspaceAuth.tsx
index 32da761a4a1a93bee935448f156ce6def559f66b..af06f33e3041a0778b9cc90c65f7790f00595bf5 100644
--- a/src/wrappers/WorkspaceAuth.tsx
+++ b/src/wrappers/WorkspaceAuth.tsx
@@ -29,7 +29,7 @@ export default (props: any) => {
 
             /* 切换ws请求记录历史接口 */
             /* getHistoryFetcher() */
-            const ws = await enterWsAndGetList(ws_id)
+            const ws = await enterWsAndGetList(ws_id) || {}
             setInitialState((p: any) => ({
                 ...p,
                 ...ws,