From f9d72619b089c029c6c5b982a7d0e62ede77781c Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Mon, 20 Mar 2023 15:21:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8C=97=E5=90=91?=
 =?UTF-8?q?=E8=BE=93=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DuerOS/Detail/command/index.vue           |  29 +-
 src/views/Northbound/DuerOS/Detail/index.vue  |   2 +
 .../Instance/Detail/Diagnose/Status/index.tsx |  13 +
 src/views/device/Instance/Detail/index.vue    |  11 +-
 src/views/device/Instance/index.vue           |   1 +
 src/views/rule-engine/Scene/SceneCard.vue     | 370 ------------------
 src/views/rule-engine/Scene/index.vue         |   1 -
 yarn.lock                                     |  16 +-
 8 files changed, 39 insertions(+), 404 deletions(-)
 delete mode 100644 src/views/rule-engine/Scene/SceneCard.vue

diff --git a/src/views/Northbound/DuerOS/Detail/command/index.vue b/src/views/Northbound/DuerOS/Detail/command/index.vue
index fc2ec36c..e9ac4084 100644
--- a/src/views/Northbound/DuerOS/Detail/command/index.vue
+++ b/src/views/Northbound/DuerOS/Detail/command/index.vue
@@ -28,6 +28,7 @@
                 </j-form-item>
             </j-col>
             <j-col
+                class="inputs"
                 :span="
                     modelRef.messageType === 'READ_PROPERTY' ||
                     actionType === 'latestData'
@@ -68,6 +69,7 @@
             </j-col>
             <j-col
                 :span="12"
+                class="inputs"
                 v-if="
                     modelRef.messageType === 'WRITE_PROPERTY' &&
                     actionType === 'command'
@@ -84,11 +86,11 @@
                     <ValueItem
                         v-model:modelValue="modelRef.message.value"
                         :itemType="
-                            property.type || property.valueType?.type || 'int'
+                            property.valueType?.type || property.type || 'int'
                         "
                         :options="
                             property.valueType?.type === 'enum'
-                                ? (property?.dataType?.elements || []).map(
+                                ? (property?.valueType?.elements || []).map(
                                       (item) => {
                                           return {
                                               label: item?.text,
@@ -190,9 +192,21 @@ const modelRef = reactive({
         properties: undefined,
         functionId: undefined,
         inputs: [],
+        value: undefined
     },
 });
 
+const property = ref<any>({});
+
+const onPropertyChange = (val: string) => {
+    if (val) {
+        const _item = props.metadata?.properties.find(
+            (item: any) => item.id === val,
+        );
+        property.value = _item || {};
+    }
+};
+
 watch(
     () => props.modelValue,
     (newVal) => {
@@ -208,8 +222,6 @@ watch(
     },
 );
 
-const property = ref<any>({});
-
 const funcChange = (val: string) => {
     if (val) {
         const arr =
@@ -227,15 +239,6 @@ const funcChange = (val: string) => {
     }
 };
 
-const onPropertyChange = (val: string) => {
-    if (val) {
-        const _item = props.metadata?.properties.find(
-            (item: any) => item.id === val,
-        );
-        property.value = _item?.[0] || {};
-    }
-};
-
 const saveBtn = () =>
     new Promise((resolve) => {
         formRef.value
diff --git a/src/views/Northbound/DuerOS/Detail/index.vue b/src/views/Northbound/DuerOS/Detail/index.vue
index 46d2d739..c52e19fa 100644
--- a/src/views/Northbound/DuerOS/Detail/index.vue
+++ b/src/views/Northbound/DuerOS/Detail/index.vue
@@ -571,6 +571,7 @@ const getTypes = async () => {
 };
 
 const getDuerOSProperties = (val: string) => {
+    console.log(val)
     const arr = modelRef.propertyMappings.map((item) => item?.source) || [];
     const checked = _.cloneDeep(arr);
     const _index = checked.findIndex((i) => i === val);
@@ -672,6 +673,7 @@ watch(
                 _data.applianceType = _data?.applianceType?.value;
             }
             Object.assign(modelRef, _data);
+            console.log(modelRef.propertyMappings)
         }
     },
     { immediate: true, deep: true },
diff --git a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
index e22f2abc..c81a20e6 100644
--- a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
+++ b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
@@ -119,6 +119,7 @@ const Status = defineComponent({
                                                     <span>网络组件已禁用，请先
                                                         <PermissionButton
                                                             type="link"
+                                                            style="padding: 0"
                                                             hasPermission="link/Type:action"
                                                             popConfirm={{
                                                                 title: '确认启用',
@@ -288,6 +289,8 @@ const Status = defineComponent({
                                                     text={<span>设备接入网关已禁用，请先
                                                         <PermissionButton
                                                             hasPermission="link/Type:action"
+                                                            type="link"
+                                                            style="padding: 0"
                                                             popConfirm={{
                                                                 title: '确认启用',
                                                                 onConfirm: async () => {
@@ -416,6 +419,8 @@ const Status = defineComponent({
                                                     设备接入网关已禁用，请先
                                                     <PermissionButton
                                                         hasPermission="link/AccessConfig:action"
+                                                        type="link"
+                                                        style="padding: 0"
                                                         popConfirm={{
                                                             title: '确认启用',
                                                             onConfirm: async () => {
@@ -528,6 +533,8 @@ const Status = defineComponent({
                                                         网关父设备已禁用，请先
                                                         <PermissionButton
                                                             hasPermission="device/Product:action"
+                                                            type="link"
+                                                            style="padding: 0"
                                                             popConfirm={{
                                                                 title: '确认启用',
                                                                 onConfirm: async () => {
@@ -636,6 +643,8 @@ const Status = defineComponent({
                                                         产品已禁用，请
                                                         <PermissionButton
                                                             hasPermission="device/Product:action"
+                                                            type="link"
+                                                            style="padding: 0"
                                                             popConfirm={{
                                                                 title: '确认启用',
                                                                 onConfirm: async () => {
@@ -712,6 +721,8 @@ const Status = defineComponent({
                                                 设备已禁用，请
                                                 <PermissionButton
                                                     hasPermission="device/Instance:action"
+                                                    type="link"
+                                                    style="padding: 0"
                                                     popConfirm={{
                                                         title: '确认启用',
                                                         onConfirm: async () => {
@@ -1720,6 +1731,8 @@ const Status = defineComponent({
                                                                 网关父设备已禁用，请先
                                                                 <PermissionButton
                                                                     hasPermission="device/Product:action"
+                                                                    type="link"
+                                                                    style="padding: 0"
                                                                     popConfirm={{
                                                                         title: '确认启用',
                                                                         onConfirm: async () => {
diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue
index 5ef614f4..716f31c4 100644
--- a/src/views/device/Instance/Detail/index.vue
+++ b/src/views/device/Instance/Detail/index.vue
@@ -1,15 +1,14 @@
 <template>
     <page-container
         :tabList="list"
-        @back="onBack"
         :tabActiveKey="instanceStore.tabActiveKey"
         @tabChange="onTabChange"
     >
         <template #title>
             <div>
                 <div style="display: flex; align-items: center">
-                    <j-button @click="onBack" size="small">返回</j-button>
-                    <div style="margin-left: 20px; font-size: 24px">
+                    <!-- <j-button @click="onBack" size="small">返回</j-button> -->
+                    <div style="font-size: 24px">
                         {{ instanceStore.current.name }}
                     </div>
                     <j-divider type="vertical" />
@@ -207,9 +206,9 @@ onMounted(() => {
     instanceStore.tabActiveKey = history.state?.params?.tab || 'Info';
 });
 
-const onBack = () => {
-    menuStory.jumpPage('device/Instance');
-};
+// const onBack = () => {
+//     menuStory.jumpPage('device/Instance');
+// };
 
 const onTabChange = (e: string) => {
     instanceStore.tabActiveKey = e;
diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue
index 2ee9dc38..48205595 100644
--- a/src/views/device/Instance/index.vue
+++ b/src/views/device/Instance/index.vue
@@ -335,6 +335,7 @@ const columns = [
         key: 'productName',
         search: {
             type: 'select',
+            rename: 'productId',
             options: () =>
                 new Promise((resolve) => {
                     queryNoPagingPost({ paging: false }).then((resp: any) => {
diff --git a/src/views/rule-engine/Scene/SceneCard.vue b/src/views/rule-engine/Scene/SceneCard.vue
deleted file mode 100644
index a47d582c..00000000
--- a/src/views/rule-engine/Scene/SceneCard.vue
+++ /dev/null
@@ -1,370 +0,0 @@
-<template>
-    <div class="card">
-        <div
-            class="card-warp"
-            :class="{ active: active ? 'active' : '' }"
-            @click="handleClick"
-        >
-            <div class="card-type">
-                <div class="card-type-text"><slot name="type"></slot></div>
-            </div>
-            <div class="card-content">
-                <div style="display: flex">
-                    <!-- 图片 -->
-                    <div class="card-item-avatar">
-                        <slot name="img"> </slot>
-                    </div>
-                    <!-- 内容 -->
-                    <div class="card-item-body">
-                        <slot name="title"></slot>
-                        <span class="subTitle">
-                            <slot name="subTitle"></slot>
-                        </span>
-                    </div>
-                </div>
-
-                <!-- 勾选 -->
-                <div v-if="active" class="checked-icon">
-                    <div>
-                        <AIcon type="CheckOutlined" />
-                    </div>
-                </div>
-
-                <!-- 状态 -->
-                <div
-                    v-if="showStatus"
-                    class="card-state"
-                    :class="statusNames ? statusNames[status] : ''"
-                >
-                    <div class="card-state-content">
-                        <BadgeStatus
-                            :status="status"
-                            :text="statusText"
-                            :statusNames="statusNames"
-                        ></BadgeStatus>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!-- 按钮 -->
-        <slot name="bottom-tool">
-            <div
-                v-if="showTool && actions && actions.length"
-                class="card-tools"
-            >
-                <div
-                    v-for="item in actions"
-                    :key="item.key"
-                    class="card-button"
-                    :class="{
-                        delete: item.key === 'delete',
-                    }"
-                >
-                    <slot name="actions" v-bind="item"></slot>
-                </div>
-            </div>
-        </slot>
-    </div>
-</template>
-
-<script setup lang="ts">
-import BadgeStatus from '@/components/BadgeStatus/index.vue';
-import { StatusColorEnum } from '@/utils/consts.ts';
-import type { ActionsType } from '@/components/Table/index.vue';
-import { PropType } from 'vue';
-
-type EmitProps = {
-    (e: 'click', data: Record<string, any>): void;
-};
-
-type TableActionsType = Partial<ActionsType>;
-
-const emit = defineEmits<EmitProps>();
-
-const props = defineProps({
-    value: {
-        type: Object as PropType<Record<string, any>>,
-        default: () => {},
-    },
-    showStatus: {
-        type: Boolean,
-        default: true,
-    },
-    showTool: {
-        type: Boolean,
-        default: true,
-    },
-    statusText: {
-        type: String,
-        default: '正常',
-    },
-    status: {
-        type: [String, Number],
-        default: 'default',
-    },
-    statusNames: {
-        type: Object,
-    },
-    actions: {
-        type: Array as PropType<TableActionsType[]>,
-        default: () => [],
-    },
-    active: {
-        type: Boolean,
-        default: false,
-    },
-});
-
-const handleClick = () => {
-    emit('click', props.value);
-};
-</script>
-
-<style lang="less" scoped>
-.card {
-    width: 100%;
-    background-color: #fff;
-    .checked-icon {
-        position: absolute;
-        right: -22px;
-        bottom: -22px;
-        z-index: 2;
-        width: 44px;
-        height: 44px;
-        color: #fff;
-        background-color: red;
-        background-color: #2f54eb;
-        transform: rotate(-45deg);
-
-        > div {
-            position: relative;
-            height: 100%;
-            transform: rotate(45deg);
-
-            > span {
-                position: absolute;
-                top: 6px;
-                left: 6px;
-                font-size: 12px;
-            }
-        }
-    }
-
-    .card-warp {
-        position: relative;
-        border: 1px solid #e6e6e6;
-        overflow: hidden;
-
-        &:hover {
-            cursor: pointer;
-            box-shadow: 0 0 24px rgba(#000, 0.1);
-
-            .card-mask {
-                visibility: visible;
-            }
-        }
-
-        &.active {
-            position: relative;
-            border: 1px solid #2f54eb;
-        }
-
-        .card-type {
-            position: absolute;
-            top: 0;
-            left: -14px;
-            height: 32px;
-            padding: 0 30px;
-            color: rgba(0, 0, 0, 0.65);
-            line-height: 32px;
-            background-color: rgba(0, 0, 0, 0.06);
-            transform: skewX(-45deg);
-            .card-type-text {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                transform: skewX(45deg);
-            }
-        }
-
-        .card-content {
-            position: relative;
-            padding: 43px 12px 19px 30px;
-            overflow: hidden;
-
-            .card-item-avatar {
-                margin-right: 16px;
-            }
-
-            .card-item-body {
-                display: flex;
-                flex-direction: column;
-                flex-grow: 1;
-                width: 0;
-
-                .subTitle {
-                    color: rgba(0, 0, 0, 0.65);
-                    font-size: 14px;
-                    margin-top: 10px;
-                }
-            }
-
-            .card-state {
-                position: absolute;
-                top: 40px;
-                right: -12px;
-                display: flex;
-                justify-content: center;
-                width: 100px;
-                padding: 2px 0;
-                background-color: rgba(#5995f5, 0.15);
-                transform: skewX(45deg);
-
-                &.success {
-                    background-color: @success-color-deprecated-bg;
-                }
-
-                &.warning {
-                    background-color: rgba(#ff9000, 0.1);
-                }
-
-                &.error {
-                    background-color: rgba(#e50012, 0.1);
-                }
-
-                .card-state-content {
-                    transform: skewX(-45deg);
-                }
-            }
-
-            :deep(.card-item-content-title) {
-                cursor: pointer;
-                font-size: 16px;
-                font-weight: 700;
-                color: @primary-color;
-                width: calc(100% - 100px);
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-            }
-
-            :deep(.card-item-heard-name) {
-                font-weight: 700;
-                font-size: 16px;
-                margin-bottom: 12px;
-            }
-
-            :deep(.card-item-content-text) {
-                color: rgba(0, 0, 0, 0.75);
-                font-size: 12px;
-            }
-        }
-    }
-
-    &.item-active {
-        position: relative;
-        color: #2f54eb;
-
-        .checked-icon {
-            display: block;
-        }
-
-        .card-warp {
-            border: 1px solid #2f54eb;
-        }
-    }
-
-    .card-tools {
-        display: flex;
-        margin-top: 8px;
-
-        .card-button {
-            display: flex;
-            flex-grow: 1;
-
-            & > :deep(span, button) {
-                width: 100%;
-                border-radius: 0;
-            }
-
-            :deep(button) {
-                width: 100%;
-                border-radius: 0;
-                background: #f6f6f6;
-                border: 1px solid #e6e6e6;
-                color: #2f54eb;
-
-                &:hover {
-                    background-color: @primary-color-hover;
-                    border-color: @primary-color-hover;
-
-                    span {
-                        color: #fff !important;
-                    }
-                }
-
-                &:active {
-                    background-color: @primary-color-active;
-                    border-color: @primary-color-active;
-
-                    span {
-                        color: #fff !important;
-                    }
-                }
-            }
-
-            &:not(:last-child) {
-                margin-right: 8px;
-            }
-
-            &.delete {
-                flex-basis: 60px;
-                flex-grow: 0;
-
-                :deep(button) {
-                    background: @error-color-deprecated-bg;
-                    border: 1px solid @error-color-outline;
-
-                    span {
-                        color: @error-color !important;
-                    }
-
-                    &:hover {
-                        background-color: @error-color-hover;
-
-                        span {
-                            color: #fff !important;
-                        }
-                    }
-
-                    &:active {
-                        background-color: @error-color-active;
-
-                        span {
-                            color: #fff !important;
-                        }
-                    }
-                }
-            }
-
-            :deep(button[disabled]) {
-                background: @disabled-bg;
-                border-color: @disabled-color;
-
-                span {
-                    color: @disabled-color !important;
-                }
-
-                &:hover {
-                    background-color: @disabled-active-bg;
-                }
-
-                &:active {
-                    background-color: @disabled-active-bg;
-                }
-            }
-        }
-    }
-}
-</style>
diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue
index fbfbc306..535e7bf4 100644
--- a/src/views/rule-engine/Scene/index.vue
+++ b/src/views/rule-engine/Scene/index.vue
@@ -132,7 +132,6 @@ import { query, _delete, _action, _execute } from '@/api/rule-engine/scene';
 import { message } from 'ant-design-vue';
 import type { ActionsType } from '@/components/Table';
 import { getImage } from '@/utils/comm';
-import SceneCard from './SceneCard.vue';
 import BadgeStatus from '@/components/BadgeStatus/index.vue';
 
 const menuStory = useMenuStore();
diff --git a/yarn.lock b/yarn.lock
index fcbb393b..6167c435 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3698,26 +3698,14 @@ 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.4:
-  version "1.0.4"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.4.tgz#cd080b2d8320c7a03ed20f4c4c22e9a5c920a3c8"
-  integrity sha512-8xzDFH6jSGNrkbCMb+/FL/g9vB0c2GdsDq6QPUzgKFwzPiS+cPbpSxL0RNHez9MF7/NSSuY8wL4VaujiVXTpfg==
-  dependencies:
-    "@vueuse/core" "^9.12.0"
-    ant-design-vue "^3.2.15"
-    colorpicker-v3 "^2.10.2"
-    lodash-es "^4.17.21"
-    monaco-editor "^0.35.0"
-
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#0c4999d28c96c11ce266c5c9706cc895010450dc"
-  integrity sha512-buCf4mWJ8cUyn+12nRRLIr25MwG60nxqWH4pZidKy/npNKt5WQXLV8PmHmf04z0xpJUnW5yY3C7QBkYoAkSgVw==
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#682711e0f69c141fff2c256db61a060c82539611"
+  integrity sha512-rQxD/YlE+XSAG7BWIcFTtKrCQJXk5o+TUgejyuUT/baBThJB6xYt1k2dQEdXyiwpukYen5FzaoLpelSD9SUegw==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"
     colorpicker-v3 "^2.10.2"
-    jetlinks-ui-components "^1.0.4"
     lodash-es "^4.17.21"
     monaco-editor "^0.35.0"