Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

src/views/rule-engine/Scene/Save/action/ListItem/Item.vue

@@ -259,9 +259,9 @@
                                 type="icon-mubiao"
                                 style="padding:0 4px"
                             />
-                          < style='max-width: 200px;margin-right: 12px;'>
+                          <Ellipsis style='max-width: 200px;margin-right: 12px;'>
                             {{data?.options?.name}}
-                          </>
+                          </Ellipsis>
                           <Ellipsis style='max-width: 400px;'>
                             {{data?.options?.propertiesName}}
                           </Ellipsis>

src/views/system/Basis/index.vue

@@ -204,7 +204,7 @@
                                     </div>
 
                                     <div class="upload-tips">推荐尺寸64*64</div>
-                                    <div class="upload-tips">支持icon格式</div>
+                                    <div class="upload-tips">支持ico格式</div>
                                 </j-form-item>
                             </j-col>
                         </j-row>

src/views/system/Department/product/index.vue

@@ -543,6 +543,13 @@ const dialogs = reactive({
     editShow: false,
     nextShow: false,
 });
+
+watch(
+    () => props.parentId,
+    () => {
+        tableData._selectedRowKeys = [];
+    },
+);
 </script>
 
 <style lang="less" scoped>