sone-ui-component-3.2.4 2.1.10 → 2.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sone-ui-component-3.2.4",
-  "version": "2.1.10",
+  "version": "2.1.13",
   "private": false,
   "main": "lib/sone-ui.common.js",
   "files": [

package/packages/dialog/src/main.vue

@@ -2,8 +2,8 @@
  * @Description:
  * @Author: xjl
  * @Date: 2021-09-08
- * @LastEditTime: 2024-07-02 16:57:23
- * @LastEditors: zzy
+ * @LastEditTime: 2024-07-24 10:25:51
+ * @LastEditors: Please set LastEditors
 -->
 <template>
   <div style="position: relative" class="sone-dialog">
@@ -29,12 +29,12 @@
         <div v-if="showDialogFullScreen" class="dialog-full-screen-btn">
           <template v-if="dialogFullScreenState">
             <el-tooltip effect="light" content="退出全屏" placement="top">
-              <el-button type="text" icon="iconfont icon-fullscreen-exit" @click.stop="dialogFullScreenState = false"></el-button>
+              <el-button type="text" icon="iconfont icon-fullscreen-exit" @click.stop="exitFullScreen"></el-button>
             </el-tooltip>
           </template>
           <template v-else>
             <el-tooltip effect="light" content="全屏" placement="top">
-              <el-button type="text" icon="iconfont icon-fullscreen" @click.stop="dialogFullScreenState = true"></el-button>
+              <el-button type="text" icon="iconfont icon-fullscreen" @click.stop="fullScreen"></el-button>
             </el-tooltip>
           </template>
         </div>
@@ -162,6 +162,14 @@ export default {
         this.timer = null;
       }, 800)
       this.$emit("confirm");
+    },
+    fullScreen(){
+      this.dialogFullScreenState = true
+      this.$emit('fullScreen',this.dialogFullScreenState)
+    },
+    exitFullScreen(){
+      this.dialogFullScreenState = false
+      this.$emit('exitFullScreen',this.dialogFullScreenState)
     }
   }
 };

package/packages/tree/src/main.vue

@@ -85,7 +85,7 @@
           </el-popover>
         </div>
         <el-input :placeholder="placeholder" v-model="filterText" :clearable="clearable" @clear="$emit('clear', '')"></el-input>
-        <div class="sone-tree-wrap">
+        <div class="sone-tree-wrap" ref="soneTreeWrap">
           <el-tree
             class="filter-tree"
             :data="handleTypeData"
@@ -137,12 +137,10 @@
             </span>
           </el-tree>
        
-        <!-- 操作菜单 -->
-        <!-- <div class="sone-tree-components-handleMenu-wrap"> -->
+          <!-- 操作菜单 -->
           <div class="sone-tree-components-handleMenu" ref="handleMenu" v-show="handleMenuFlag" >
             <slot name="handleMenu" :node="node" ></slot>
           </div>
-        <!-- </div> -->
         </div>
         
 
@@ -253,6 +251,11 @@ export default {
     showMoreBtn:{
       type:Boolean,
       default:true
+    },
+    menuHeight:{
+      type:Number,
+      default:0,
+      remark:"菜单高度"
     }
   },
   data() {
@@ -273,7 +276,6 @@ export default {
       checkedData:{},
 
       node:{},
-
     };
   },
   watch: {
@@ -352,8 +354,15 @@ export default {
     },
     handleContextmenu(event, data, node, self) {
       if ( this.type != 'handle' ) return
-      this.$refs.handleMenu.style.top = self.$el.offsetTop - 0 + 25 + 'px'
-      this.$refs.handleMenu.style.right = '5px'
+      let soneTreeWrapHeight = this.$refs.soneTreeWrap.clientHeight
+      //self.offsetTop + menuHeight >父元素高度 用向上展开的样式
+      if(this.menuHeight > 0 && self.$el.offsetTop + this.menuHeight > soneTreeWrapHeight){
+        this.$refs.handleMenu.style.top = self.$el.offsetTop - 0 - this.menuHeight + 'px'
+        this.$refs.handleMenu.style.right = '5px'
+      }else{
+        this.$refs.handleMenu.style.top = self.$el.offsetTop - 0 + 25 + 'px'
+        this.$refs.handleMenu.style.right = '5px'
+      }
       node.data.noMoreBtn ? this.handleMenuFlag = false : this.handleMenuFlag = true
 
       this.checkedData = node
@@ -387,7 +396,7 @@ export default {
       if (!value) return true;
       return data[this.treeProps.label].indexOf(value) !== -1||data[this.treeProps.label]===this.allowShowLabel;
     },
-    handleNodeClick(data) {
+    handleNodeClick(data,node,self) {
       this.handleMenuFlag = false
       this.$emit("node-click", data);
     },

package/src/index.js

@@ -55,7 +55,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.1.10',
+  version: '2.1.13',
   locale: locale.use,
   i18n: locale.i18n,
   install,