fix: 优化设备物模型

src/views/device/components/Metadata/Base/Base.vue

@@ -119,9 +119,14 @@
             v-if="target === 'device' && productNoEdit.id?.includes?.(data.record._sortIndex)"
             title="继承自产品物模型的数据不支持删除"
           >
-            <ModelButton :disabled="true"/>
+<!--            <ModelButton :disabled="true"/>-->
+            <j-button :disabled="true" type="link" style="padding-left: 0;">
+              <AIcon type="SettingOutlined" />
+              配置
+            </j-button>
           </j-tooltip>
           <OtherSetting
+              v-else
            v-model:value="data.record.expands"
            :type="data.record.valueType.type"
           :disabled="target === 'device' && productNoEdit.id?.includes?.(data.record._sortIndex)"
@@ -239,6 +244,7 @@ import { onlyMessage } from '@/utils/comm';
 import {omit} from "lodash-es";
 import {useAction} from "@/views/device/components/Metadata/Base/hooks/useAction";
 import { PropertiesModal, FunctionModal, EventModal, TagsModal } from './DetailModal'
+import ModelButton from '@/views/device/components/Metadata/Base/components/ModelButton.vue'
 
 const props = defineProps({
     target: {

src/views/device/components/Metadata/Base/columns.tsx

@@ -325,12 +325,12 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
           noEdit: noEdit?.value?.source || []
         }
       },
-      doubleClick(record){
-        console.log(record);
-        return target !== 'device' ||  (target === 'device' && record.expands.source === 'rule')
-      },
+      // doubleClick(record){
+      //   console.log(record);
+      //   return target !== 'device' ||  (target === 'device' && record.expands.source === 'rule')
+      // },
       form: {
-        required: true,
+        required: target !== 'device',
         rules: target !== 'device' ? [
           {
             validator: async (_: Record<string, any>, value: any) => {

src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue

@@ -48,8 +48,8 @@
             description="没有动态配置项"
         />
       </div>
-
     </template>
+
     <ModelButton :disabled="disabled"/>
   </j-popconfirm-modal>
 </template>

yarn.lock

@@ -3837,8 +3837,8 @@ jetlinks-ui-components@^1.0.23:
 
 jetlinks-ui-components@^1.0.24:
   version "1.0.24"
-  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#68660b63aea9b4befeaa4c5e3ff121668bb984bb"
-  integrity sha512-09s73oEPKf+TC3KVL4suXrI4FjylJqyB2qXbFQtBOqyK/mSfMN/TJ7mcEoZdycBqAvmv35zTDKXIQIcvAAaitQ==
+  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#dc81f8d6f5e65a64d47b510944a64078b82b4b87"
+  integrity sha512-y0609PnaAxFonA4rYYdMa5p6uKtCqzW/UVtjB0dx18ICZqs7vGCDMrVkZZ5iEkKWra2wJawIk0MFdw2aCXLZdA==
   dependencies:
     "@vueuse/core" "^9.12.0"
     "@vueuse/router" "^9.13.0"