evui 3.1.57 → 3.1.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evui",
-  "version": "3.1.57",
+  "version": "3.1.58",
   "description": "A EXEM Library project",
   "author": "exem <dev_client@ex-em.com>",
   "license": "MIT",

package/src/components/grid/Grid.vue

@@ -93,7 +93,7 @@
               <span
                 :title="column.caption"
                 class="column-name"
-                @click.stop="onSort(column.field)"
+                @click.stop="onSort(column)"
               >
                 {{ column.caption }}
               </span>

package/src/components/grid/uses.js

@@ -475,17 +475,20 @@ export const sortEvent = (params) => {
   /**
    * sort 이벤트를 처리한다.
    *
-   * @param {string} field - 컬럼 field
+   * @param {object} column - 컬럼 정보
    */
-  const onSort = (field) => {
-    if (sortInfo.sortField !== field) {
-      order.orders = ['asc', 'desc', 'init'];
-      sortInfo.sortField = field;
-    }
-    sortInfo.sortOrder = order.dequeue();
-    order.enqueue(sortInfo.sortOrder);
+  const onSort = (column) => {
+    const sortable = column.sortable === undefined ? true : column.sortable;
+    if (sortable) {
+      if (sortInfo.sortField !== column?.field) {
+        order.orders = ['asc', 'desc', 'init'];
+        sortInfo.sortField = column?.field;
+      }
+      sortInfo.sortOrder = order.dequeue();
+      order.enqueue(sortInfo.sortOrder);
 
-    sortInfo.isSorting = true;
+      sortInfo.isSorting = true;
+    }
   };
   /**
    * 설정값에 따라 해당 컬럼 데이터에 대해 정렬한다.

package/src/components/window/uses.js

@@ -56,7 +56,7 @@ const useModel = () => {
     return result;
   };
 
-  const removeUnit = (input, direction) => {
+  const removeUnit = (input, direction = 'horizontal') => {
     if (typeof input === 'number') {
       return input;
     } else if (!input) {
@@ -226,9 +226,9 @@ const useMouseEvent = (param) => {
     const posY = +y - rect.top;
     const headerAreaStyleInfo = headerRef.value.style;
     const headerPaddingInfo = {
-      top: removeUnit(headerAreaStyleInfo.paddingTop),
-      left: removeUnit(headerAreaStyleInfo.paddingLeft),
-      right: removeUnit(headerAreaStyleInfo.paddingRight),
+      top: removeUnit(headerAreaStyleInfo.paddingTop, 'vertical'),
+      left: removeUnit(headerAreaStyleInfo.paddingLeft, 'horizontal'),
+      right: removeUnit(headerAreaStyleInfo.paddingRight, 'horizontal'),
     };
     const startPosX = headerPaddingInfo.left;
     const endPosX = rect.width - headerPaddingInfo.right;
@@ -279,17 +279,17 @@ const useMouseEvent = (param) => {
     if (hasOwnProperty.call(paramObj, 'minWidth')) {
       tMinWidth = paramObj.minWidth;
     } else {
-      tMinWidth = removeUnit(props.minWidth, 'horizontal');
+      tMinWidth = props.minWidth;
     }
 
     if (hasOwnProperty.call(paramObj, 'minHeight')) {
       tMinHeight = paramObj.minHeight;
     } else {
-      tMinHeight = removeUnit(props.minHeight, 'vertical');
+      tMinHeight = props.minHeight;
     }
 
-    width = Math.max(width, tMinWidth);
-    height = Math.max(height, tMinHeight);
+    width = removeUnit(width, 'horizontal') > removeUnit(tMinWidth, 'horizontal') ? width : tMinWidth;
+    height = removeUnit(height, 'vertical') > removeUnit(tMinHeight, 'vertical') ? height : tMinHeight;
 
     dragStyle.top = numberToUnit(top);
     dragStyle.left = numberToUnit(left);
@@ -433,6 +433,8 @@ const useMouseEvent = (param) => {
       setDragStyle({
         top: `${tempTop}px`,
         left: `${tempLeft}px`,
+        width: props.width,
+        height: props.height,
       });
     } else if (props.resizable && clickedInfo.pressedSpot === 'border') {
       resizeWindow(e);