Apps > Merge - prototype

minjk-bl · minjk-bl · commit 083f864ce15a · 2021-10-18T15:47:26.000+09:00
diff --git a/css/common/merge.css b/css/common/merge.css
@@ -1,4 +1,27 @@
 .vp-mg-container {
     width: 700px;
     height: 550px;
+}
+
+.vp-mg-container .vp-pp-body {
+    overflow: hidden;
+}
+
+.vp-mg-df-box {
+    display: grid;
+    grid-template-rows: 30px;
+    grid-row-gap: 5px;
+}
+
+.vp-mg-df-refresh {
+    display: inline-block;
+    cursor: pointer;
+    margin-left: 5px;
+}
+.vp-mg-df-box label {
+    font-weight: bold;
+}
+.vp-mg-df-box select,
+.vp-mg-df-box input {
+    width: 160px;
 }
diff --git a/css/component/common.css b/css/component/common.css
@@ -46,7 +46,9 @@
     background: #EF6B10;
 }
 .vp-button.disabled,
-.vp-button.disabled:hover {
+.vp-button.disabled:hover,
+.vp-button:disabled,
+.vp-button:disabled:hover {
     background: #E5E5E5;
     border: 0px;
     border: 0.25px solid #E4E4E4;
diff --git a/src/api/functions/pandasCommand.py b/src/api/functions/pandasCommand.py
@@ -51,9 +51,12 @@ def _vp_get_multi_columns_list(dfs = []):
     """
     Get Columns List with Detail Information of multiple dataframe
     """
-    common_set = {}
-    for df in dfs:
-        common_set = common_set & set(df)
+    if len(dfs) <= 0:
+        return []
+
+    common_set = set(dfs[0].columns)
+    for df in dfs[1:]:
+        common_set = common_set & set(df.columns)
     common_columns = list(common_set)
 
     colList = []
diff --git a/src/common/vpGroupby.js b/src/common/vpGroupby.js
@@ -358,7 +358,6 @@ define([
             page.appendLine('<div>');
             page.appendFormatLine('<label for="{0}" class="{1}">{2}</label>', 'vp_gbAllocateTo', 'wp80', 'Allocate to');
             page.appendFormatLine('<input type="text" id="{0}" placeholder="{1}"/>', 'vp_gbAllocateTo', 'New variable name');
-            
             page.appendLine('</div>');
             
             page.appendLine('</div>'); // end of df-box
@@ -663,6 +662,8 @@ define([
                     $(that._wrapSelector('#vp_gbBy')).val('');
                     $(that._wrapSelector('#vp_gbDisplay')).val('');
                     that.state.variable = newVal;
+                    that.state.groupby = [];
+                    that.state.display = [];
                 }
             });
 
diff --git a/src/common/vpMerge.js b/src/common/vpMerge.js
