diff --git a/.npmrc b/.npmrc index dfe2ca70..f408e702 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,2 @@ always-auth=true -registry=http://registry.jetlinks.cn/ \ No newline at end of file +registry=https://registry.npmjs.org/ diff --git a/package.json b/package.json index 85968eac..e3ce16ae 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "event-source-polyfill": "^1.0.31", "global": "^4.4.0", "jetlinks-store": "^0.0.3", - "jetlinks-ui-components": "^1.0.33", + "jetlinks-ui-components": "^1.0.34", "js-cookie": "^3.0.1", "jsencrypt": "^3.3.2", "less": "^4.1.3", diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue index 06140d40..09b5e9c2 100644 --- a/src/views/device/components/Metadata/Base/Base.vue +++ b/src/views/device/components/Metadata/Base/Base.vue @@ -65,16 +65,13 @@ 配置 - + - - - + @@ -23,7 +31,7 @@ import {omit} from "lodash-es"; import {TypeStringMap, validatorConfig} from "../../columns"; const columns = [ - { + { title: '参数标识', dataIndex: 'id', type: 'text', @@ -52,7 +60,7 @@ const columns = [ ] } }, - { + { title: '参数名称', dataIndex: 'name', type: 'text', @@ -139,6 +147,7 @@ const props = defineProps({ type: Array as PropType<{ label: string; value: string }[]>, default: () => [], }, + hasPermission: String, }); const value = ref(props.value.properties); @@ -151,7 +160,7 @@ const confirm = (data: any) => { }) console.log('ConfigParams',newObject) - + emit('update:value', { properties: newObject, type: 'object', diff --git a/src/views/device/components/Metadata/Base/components/Function/InputParams.vue b/src/views/device/components/Metadata/Base/components/Function/InputParams.vue index 0feb48a0..5c1ab244 100644 --- a/src/views/device/components/Metadata/Base/components/Function/InputParams.vue +++ b/src/views/device/components/Metadata/Base/components/Function/InputParams.vue @@ -9,7 +9,14 @@ - + + + 配置 + @@ -43,6 +50,7 @@ const props = defineProps({ type: Array as PropType<{ label: string; value: string }[]>, default: () => [], }, + hasPermission: String, }); const formItemContext = Form.useInjectFormItemContext(); diff --git a/src/views/device/components/Metadata/Base/components/ModelButton.vue b/src/views/device/components/Metadata/Base/components/ModelButton.vue index 49793ff0..98014d17 100644 --- a/src/views/device/components/Metadata/Base/components/ModelButton.vue +++ b/src/views/device/components/Metadata/Base/components/ModelButton.vue @@ -17,4 +17,4 @@ const props = defineProps({ \ No newline at end of file + diff --git a/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue b/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue index 3ec50f62..36a95a79 100644 --- a/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue +++ b/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue @@ -51,8 +51,17 @@ /> - - + + + 配置 + @@ -88,6 +97,8 @@ const props = defineProps({ type: Object, default: () => ({}) }, + hasPermission: String, + tooltip: Object }) const fullRef = inject(FULL_CODE); @@ -225,4 +236,4 @@ watch(() => props.value, () => { \ No newline at end of file + diff --git a/yarn.lock b/yarn.lock index 3c153b78..bdaf773a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3738,10 +3738,10 @@ jetlinks-store@^0.0.3: resolved "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz" integrity sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q== -jetlinks-ui-components@^1.0.33: - version "1.0.33" - resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.33.tgz#49ce2b8c1e7be66272864728d5df82f834ec4490" - integrity sha512-vYUP4MhzO6r0golmKqO8lHk8w5ldhAkgXWZfFII1Zoa7JtUwveqpSywTU23iSmCN+4muPaSLvHw713k6OdzLmg== +jetlinks-ui-components@^1.0.34: + version "1.0.34" + resolved "https://registry.npmjs.org/jetlinks-ui-components/-/jetlinks-ui-components-1.0.34.tgz#e158f87cf626904fd97b63fa379dbea12dc0230f" + integrity sha512-1O41g3VYrwnHJ3AWCbfbTaq62B55EwLvOC9frbiF1y/Lf+GZBkK1D1R4+gFQF/pgDdonlZoaT5pE1mdZWXrfHQ== dependencies: "@vueuse/core" "^9.12.0" "@vueuse/router" "^9.13.0"