Merge branch 'fix/linkedge' into 'main_dev'

fix: 修复场景联动查看模式下无法展开条件筛选

See merge request yunteng/thingskit-front!1021

@@ -47,6 +47,7 @@
     isClose: { type: Boolean, default: true },
     isClose: { type: Boolean, default: true },
     title: { type: String, default: '' },
     title: { type: String, default: '' },
     loading: { type: Boolean },
     loading: { type: Boolean },
+    defaultExpand: { type: Boolean, default: true },
     /**
     /**
      *  Can it be expanded
      *  Can it be expanded
      */
      */
@@ -75,7 +76,7 @@
 
 
   const emit = defineEmits(['expand', 'change', 'hchange']);
   const emit = defineEmits(['expand', 'change', 'hchange']);
 
 
-  const show = ref(true);
+  const show = ref(props.defaultExpand);
 
 
   const { prefixCls } = useDesign('collapse-container');
   const { prefixCls } = useDesign('collapse-container');
 
 

@@ -53,6 +53,8 @@
     const index = unref(conditionListElRef).findIndex((item) => item.key === key);
     const index = unref(conditionListElRef).findIndex((item) => item.key === key);
 
 
     ~index && unref(conditionListElRef).splice(index, 1);
     ~index && unref(conditionListElRef).splice(index, 1);
+
+    handleConditionFormValueChange();
   };
   };
 
 
   const handleAdd = () => {
   const handleAdd = () => {
@@ -82,7 +84,7 @@
 
 
 <template>
 <template>
   <Card class="condition-filter-card !border-dashed !border-2 !border-gray-200 !rounded-lg">
   <Card class="condition-filter-card !border-dashed !border-2 !border-gray-200 !rounded-lg">
-    <CollapseContainer class="rounded-lg" :is-close="!disabledDrawer">
+    <CollapseContainer class="rounded-lg" :default-expand="!disabledDrawer">
       <template #title>
       <template #title>
         <section class="flex !p-2">
         <section class="flex !p-2">
           <div class="w-20 flex-grow-0 flex-shrink-0"> 条件筛选 </div>
           <div class="w-20 flex-grow-0 flex-shrink-0"> 条件筛选 </div>

@@ -76,7 +76,14 @@
 </script>
 </script>
 
 
 <template>
 <template>
-  <BasicModal @register="registerModal" title="启用规则" :width="600" @ok="handleOk">
+  <BasicModal
+    @register="registerModal"
+    title="启用规则"
+    :width="600"
+    @ok="handleOk"
+    :cancel-text="disabledDrawer ? '关闭' : '取消'"
+    :show-ok-btn="!disabledDrawer"
+  >
     <BasicForm @register="register" :disabled="disabledDrawer">
     <BasicForm @register="register" :disabled="disabledDrawer">
       <template #custom="{ model, field }">
       <template #custom="{ model, field }">
         <CustomRule ref="customRuleElRef" v-model:value="model[field]" />
         <CustomRule ref="customRuleElRef" v-model:value="model[field]" />