Commit a2194ff7ead3200e697a086e202bf8198ceccde1

Authored by fengwotao
2 parents f9018530 7b156af3

Merge branch 'main' into local_dev_ft

@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
44 "ant-design-vue": "2.2.6", 44 "ant-design-vue": "2.2.6",
45 "axios": "^0.21.1", 45 "axios": "^0.21.1",
46 "codemirror": "^5.62.2", 46 "codemirror": "^5.62.2",
  47 + "core-js": "^3.28.0",
47 "cron-parser": "3.5.0", 48 "cron-parser": "3.5.0",
48 "cropperjs": "^1.5.12", 49 "cropperjs": "^1.5.12",
49 "crypto-js": "^4.1.1", 50 "crypto-js": "^4.1.1",
@@ -16,6 +16,7 @@ import { registerGlobComp } from '/@/components/registerGlobComp'; @@ -16,6 +16,7 @@ import { registerGlobComp } from '/@/components/registerGlobComp';
16 import '/@/assets/iconfont/iconfont'; 16 import '/@/assets/iconfont/iconfont';
17 import { usePlatform } from './views/system/customize/hook/usePlatformInfo'; 17 import { usePlatform } from './views/system/customize/hook/usePlatformInfo';
18 import { useWebSecurityPolicy } from './hooks/web/useWebSecurityPolicy'; 18 import { useWebSecurityPolicy } from './hooks/web/useWebSecurityPolicy';
  19 +import 'core-js/es/array/at';
19 20
20 if (import.meta.env.DEV) { 21 if (import.meta.env.DEV) {
21 import('ant-design-vue/dist/antd.less'); 22 import('ant-design-vue/dist/antd.less');
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 > 25 >
26 <TabPane :key="FunctionType.PROPERTIES" tab="属性" /> 26 <TabPane :key="FunctionType.PROPERTIES" tab="属性" />
27 <TabPane :key="FunctionType.SERVICE" :disabled="isTCPGatewaySubDevice" tab="服务" /> 27 <TabPane :key="FunctionType.SERVICE" :disabled="isTCPGatewaySubDevice" tab="服务" />
28 - <!-- <TabPane :key="FunctionType.EVENTS" tab="事件" :disabled=" isTCPGatewaySubDevice" /> --> 28 + <TabPane :key="FunctionType.EVENTS" tab="事件" :disabled="isTCPGatewaySubDevice" />
29 </Tabs> 29 </Tabs>
30 <Attribute v-if="activeKey === FunctionType.PROPERTIES" ref="AttrRef" /> 30 <Attribute v-if="activeKey === FunctionType.PROPERTIES" ref="AttrRef" />
31 <Service 31 <Service