From 2f5c4fb7bb0aef3fbf13a691cf1405f2bad2e3a1 Mon Sep 17 00:00:00 2001
From: carson_git <543983849@qq.com>
Date: Wed, 16 Dec 2020 12:44:09 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E6=8F=90=E7=A4=BA=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FunctionTabs/Query/index.vue   | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/FunctionTabs/Query/index.vue b/ui/src/components/FunctionTabs/Query/index.vue
index c72aa03..7adcd94 100644
--- a/ui/src/components/FunctionTabs/Query/index.vue
+++ b/ui/src/components/FunctionTabs/Query/index.vue
@@ -2,9 +2,13 @@
   <div class="container">
     <a-auto-complete
       class="input"
+      :options="opts"
       allow-clear
       v-model:value="input"
       placeholder="dataframe.query 的 内容"
+      @search="onSearch"
+      @select="onSelect"
+      :defaultOpen="true"
     />
 
     <a-button type="primary" @click="onApply" :disabled="!applyBtnDisplay"
@@ -16,14 +20,44 @@
 <script lang='ts'>
 import { computed, defineComponent, reactive, ref } from "vue";
 import * as apps from "@/applications";
+import DfStore from "@/store/DfStore";
 
 export default defineComponent({
   name: "Query",
 
   setup() {
-    let input = ref("");
+    let input = ref(" ");
     let applyBtnDisplay = computed(() => input.value.length > 0);
 
+    const opts = ref([] as object);
+
+    const colInfos = DfStore.getStateReadonly().columnInfo;
+
+    const onSelect = (value: any, option: any) => {
+      input.value = option.text;
+    };
+
+    const onSearch = (searchText: any) => {
+      opts.value = searchText ? searchResult(searchText) : [];
+
+      function searchResult(query: any) {
+        const arr: string[] = query.split(/\s+/);
+        const value = arr.slice(-1)[0];
+
+        return colInfos
+          .filter((v) => v.field.indexOf(value) >= 0)
+          .map((v) => {
+            const value =
+              arr.slice(0, arr.length - 1).join(" ") + " " + v.field;
+
+            return {
+              text: value.trim(),
+              value: `${v.field}(${v.type})`,
+            };
+          });
+      }
+    };
+
     let onApply = async () => {
       await apps.filterByPandasQeury(input.value);
     };
@@ -32,6 +66,9 @@ export default defineComponent({
       input,
       onApply,
       applyBtnDisplay,
+      opts,
+      onSearch,
+      onSelect,
     };
   },
 });
-- 
Gitee


From ab9710d6b49a83e5929b70a2e3c8cbfce8e75c6c Mon Sep 17 00:00:00 2001
From: carson_git <543983849@qq.com>
Date: Wed, 16 Dec 2020 16:04:47 +0800
Subject: [PATCH 2/5]

---
 py/build.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/py/build.py b/py/build.py
index bca58f2..4263fd7 100644
--- a/py/build.py
+++ b/py/build.py
@@ -6,10 +6,11 @@ import os
 m_dist_app_path = plib.Path('dist/app')
 m_dist_src_path = m_dist_app_path / 'src'
 m_dist_web_path = m_dist_app_path / 'web'
-m_dist_main_path = m_dist_app_path / 'main.py'
+m_dist_main_path = m_dist_app_path / 'main.pyc'
 m_dist_startup_path = m_dist_app_path / 'startup.bat'
 
 compileall.compile_dir(r'src')
+compileall.compile_file('main.py')
 print('编译完毕')
 
 if os.path.exists(m_dist_src_path):
@@ -50,7 +51,7 @@ for f in fs:
     shutil.copyfile(f[0], f[1])
 
 
-shutil.copyfile('main.py', m_dist_main_path)
+shutil.copyfile('__pycache__/main.cpython-37.pyc', m_dist_main_path)
 
 shutil.copytree('web', m_dist_web_path)
 
-- 
Gitee


From ef4129a4fd28670def86ceecb7b3d6fa5d9e06dd Mon Sep 17 00:00:00 2001
From: carson_git <543983849@qq.com>
Date: Wed, 16 Dec 2020 16:05:05 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/App.vue                                |  50 +++-
 ui/src/components/Commander/index.vue         |  97 +++----
 .../FunctionTabs/CodeBuilder/index.vue        |  16 +-
 .../components/FunctionTabs/Groupby/index.vue | 249 ++++++++++--------
 .../components/FunctionTabs/Query/index.vue   |   7 +-
 ui/src/components/FunctionTabs/index.vue      |  24 +-
 ui/src/index.css                              |  20 ++
 ui/src/main.ts                                |   1 +
 ui/src/plugins/vant.ts                        |   4 +-
 9 files changed, 275 insertions(+), 193 deletions(-)
 create mode 100644 ui/src/index.css

diff --git a/ui/src/App.vue b/ui/src/App.vue
index fce4be0..4e14739 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -1,21 +1,27 @@
 <template>
-  <div class="container-h">
-    <div class="item-left">
-      <div class="v">
-        <Commander></Commander>
+  <div class="wrapper">
+    <div class="container-v">
+      <div class="item-top">
+        <header class="tabs_wrapper">
+          <FunctionTabs></FunctionTabs>
+        </header>
       </div>
-    </div>
-
-    <div class="item-right container-v">
-      <header class="tabs">
-        <FunctionTabs></FunctionTabs>
-      </header>
 
       <a-divider></a-divider>
 
-      <main class="table">
-        <TableContent></TableContent>
-      </main>
+      <div class="item-bottom container-h">
+        <div class="item-left">
+          <div class="v">
+            <Commander></Commander>
+          </div>
+        </div>
+
+        <div class="item-right">
+          <main class="table">
+            <TableContent></TableContent>
+          </main>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -43,6 +49,12 @@ export default defineComponent({
 
 
 <style lang="less" scoped>
+header.tabs_wrapper {
+  max-width: 90vw;
+  margin-left: auto;
+  margin-right: auto;
+}
+
 main.table {
   min-height: 50vh;
 }
@@ -73,5 +85,17 @@ div.container-h {
 div.container-v {
   display: flex;
   flex-direction: column;
+
+  > div.item-top {
+    flex-grow: 0;
+    padding: 0 auto;
+    margin-right: 10px;
+    flex-shrink: 0;
+  }
+
+  > div.item-bottom {
+    flex-grow: 1;
+    overflow: auto;
+  }
 }
 </style>
diff --git a/ui/src/components/Commander/index.vue b/ui/src/components/Commander/index.vue
index 3337675..b083990 100644
--- a/ui/src/components/Commander/index.vue
+++ b/ui/src/components/Commander/index.vue
@@ -1,51 +1,57 @@
 <template>
-  <a-steps
-    class="step-gp"
-    :current="3"
-    size="small"
-    direction="vertical"
-    @change="onChange"
-  >
-    <!-- a-step.step[title='test$']*20 -->
-
-    <a-step
-      v-for="c in cmds"
-      class="step"
-      :key="c._id"
-      :status="c.hasError ? 'error' : 'finish'"
+  <div class="wrapper">
+    <a-steps
+      class="step-gp"
+      :current="3"
+      size="small"
+      direction="vertical"
+      @change="onChange"
     >
-      <template #title>
-        <a-tag color="green">
-          <template #icon>
-            <a-popconfirm
-              title="确定删除这个操作？可能导致现有的后续操作产生异常"
-              ok-text="是"
-              cancel-text="我再想想"
-              @confirm="onCloseTag(c._id)"
-            >
-              <a href="#"><DeleteOutlined /></a>
-            </a-popconfirm>
-          </template>
-
-          <a-popover trigger="click" placement="right">
-            <span>{{ c.name }}</span>
+      <!-- a-step.step[title='test$']*20 -->
 
-            <template #content>
-              <a-descriptions style="width: 50vw" title="调用信息" :column="1">
-                <a-descriptions-item label="code">
-                  <code>
-                    <pre>{{ c.code }}</pre>
-                  </code>
-                </a-descriptions-item>
-              </a-descriptions>
+      <a-step
+        v-for="c in cmds"
+        class="step"
+        :key="c._id"
+        :status="c.hasError ? 'error' : 'finish'"
+      >
+        <template #title>
+          <a-tag color="green">
+            <template #icon>
+              <a-popconfirm
+                title="确定删除这个操作？可能导致现有的后续操作产生异常"
+                ok-text="是"
+                cancel-text="我再想想"
+                @confirm="onCloseTag(c._id)"
+              >
+                <a href="#" style="color: red"><DeleteOutlined /></a>
+              </a-popconfirm>
             </template>
-          </a-popover>
-        </a-tag>
-      </template>
-    </a-step>
 
-    <!-- <a-step class="step" title="test4" status='error'></a-step> -->
-  </a-steps>
+            <a-popover trigger="click" placement="right">
+              <span>{{ c.name }}</span>
+
+              <template #content>
+                <a-descriptions
+                  style="width: 50vw"
+                  title="调用信息"
+                  :column="1"
+                >
+                  <a-descriptions-item label="code">
+                    <code>
+                      <pre>{{ c.code }}</pre>
+                    </code>
+                  </a-descriptions-item>
+                </a-descriptions>
+              </template>
+            </a-popover>
+          </a-tag>
+        </template>
+      </a-step>
+
+      <!-- <a-step class="step" title="test4" status='error'></a-step> -->
+    </a-steps>
+  </div>
 </template>
 
 <script lang='ts'>
@@ -76,8 +82,9 @@ export default defineComponent({
 
 <style lang="less" scoped>
 .step-gp {
-  width: 100%;
-  margin: 10px 5px 0px 5px;
+  // width: 100%;
+
+  // margin-top: 20px;
 }
 
 .ant-tag-close-icon {
diff --git a/ui/src/components/FunctionTabs/CodeBuilder/index.vue b/ui/src/components/FunctionTabs/CodeBuilder/index.vue
index 49a7ee1..ce90761 100644
--- a/ui/src/components/FunctionTabs/CodeBuilder/index.vue
+++ b/ui/src/components/FunctionTabs/CodeBuilder/index.vue
@@ -1,10 +1,12 @@
 <template>
-  <code id="code">
-    <pre>{{ code }}</pre>
-    <!-- <textarea>{{ code }}</textarea> -->
-  </code>
-
-  <a-button type="primary" @click="onCopy">复制</a-button>
+  <div class="wrapper context_wrapper">
+    <code id="code">
+      <pre>{{ code }}</pre>
+      <!-- <textarea>{{ code }}</textarea> -->
+    </code>
+
+    <a-button type="primary" @click="onCopy">复制</a-button>
+  </div>
 </template>
 
 <script lang='ts'>
@@ -39,5 +41,5 @@ export default defineComponent({
 });
 </script>
 
-<style>
+<style lang="less" scoped>
 </style>
\ No newline at end of file
diff --git a/ui/src/components/FunctionTabs/Groupby/index.vue b/ui/src/components/FunctionTabs/Groupby/index.vue
index 41b0ea4..78c7235 100644
--- a/ui/src/components/FunctionTabs/Groupby/index.vue
+++ b/ui/src/components/FunctionTabs/Groupby/index.vue
@@ -1,99 +1,98 @@
 <template>
-  <div class="container">
-    <div class="columns">
-      <h3>列</h3>
-
-      <div class="content">
-        <draggable
-          :move="onMove"
-          :sort="false"
-          class="drag"
-          :list="fields"
-          :group="{ name: 'src', pull: 'clone', put: false }"
-          item-key="field"
-          :clone="onSrcClone"
-        >
-          <template #item="{ element }">
-            <div>
-              <a-popover title="详细信息" trigger="click">
-                <a-tag color="processing">{{ element.label }}</a-tag>
-              </a-popover>
-            </div>
-          </template>
-        </draggable>
-      </div>
-    </div>
-
-    <div class="keys">
-      <h3>分组keys</h3>
-
-      <div class="content">
-        <draggable
-          :move="onMove"
-          class="drag"
-          :list="groupKeys"
-          group="src"
-          item-key="__key"
-        >
-          <template #item="{ element }">
-            <div>
-              <a-tag
-                color="success"
-                closable
-                @close="onGroupKeysTagClose(element.__key)"
-                >{{ element.title }}</a-tag
-              >
-            </div>
-          </template>
-        </draggable>
-      </div>
-    </div>
-
-    <div class="agg">
-      <h3>聚合</h3>
-      <div class="content">
-        <draggable
-          @add="onAggAdded"
-          class="drag"
-          :list="aggFields"
-          group="src"
-          item-key="__key"
-        >
-          <template #item="{ element }">
-            <div>
-              <a-tag
-                style="width: 80%"
-                color="success"
-                closable
-                @close="onAggTagClose(element.__key)"
-                >{{ element.title }} <span>：</span>
-                <a-select
-                  v-model:value="selectOptsMapping[element.__key]"
-                  mode="multiple"
-                  style="width: 50%"
-                  placeholder="选择聚合方式"
-                  option-label-prop="label"
+  <div class="wrapper">
+    <a-affix :offset-top="10">
+      <a-button v-if="applyDisplay" @click="onApply" type="danger"
+        >应用</a-button
+      >
+    </a-affix>
+
+    <div class="container">
+      <a-card title="列" class="columns card-item">
+        <div class="content">
+          <draggable
+            :move="onMove"
+            :sort="false"
+            class="drag"
+            :list="fields"
+            :group="{ name: 'src', pull: 'clone', put: false }"
+            item-key="field"
+            :clone="onSrcClone"
+          >
+            <template #item="{ element }">
+              <div>
+                <a-popover title="详细信息" trigger="click">
+                  <a-tag color="processing">{{ element.label }}</a-tag>
+                </a-popover>
+              </div>
+            </template>
+          </draggable>
+        </div>
+      </a-card>
+
+      <a-card title="分组keys" class="keys card-item">
+        <div class="content">
+          <draggable
+            :move="onMove"
+            class="drag"
+            :list="groupKeys"
+            group="src"
+            item-key="__key"
+          >
+            <template #item="{ element }">
+              <div>
+                <a-tag
+                  color="success"
+                  closable
+                  @close="onGroupKeysTagClose(element.__key)"
+                  >{{ element.title }}</a-tag
                 >
-                  <a-select-option
-                    v-for="opt in opts[element.type]"
-                    :value="opt"
-                    :label="opt"
-                    :key="opt"
+              </div>
+            </template>
+          </draggable>
+        </div>
+      </a-card>
+
+      <a-card title="聚合" class="agg card-item">
+        <div class="content">
+          <draggable
+            @add="onAggAdded"
+            class="drag"
+            :list="aggFields"
+            group="src"
+            item-key="__key"
+          >
+            <template #item="{ element }">
+              <div>
+                <a-tag
+                  style="width: 80%"
+                  color="success"
+                  closable
+                  @close="onAggTagClose(element.__key)"
+                  >{{ element.title }} <span>：</span>
+                  <a-select
+                    v-model:value="selectOptsMapping[element.__key]"
+                    mode="multiple"
+                    style="width: 50%"
+                    placeholder="选择聚合方式"
+                    option-label-prop="label"
                   >
-                    {{ opt }}
-                  </a-select-option>
-                </a-select>
-              </a-tag>
-            </div>
-          </template>
-        </draggable>
-      </div>
+                    <a-select-option
+                      v-for="opt in opts[element.type]"
+                      :value="opt"
+                      :label="opt"
+                      :key="opt"
+                    >
+                      {{ opt }}
+                    </a-select-option>
+                  </a-select>
+                </a-tag>
+              </div>
+            </template>
+          </draggable>
+        </div>
+      </a-card>
     </div>
   </div>
-
-  <div class="apply-btn">
-    <a-button v-if="applyDisplay" @click="onApply" type="danger">应用</a-button>
-  </div>
 </template>
 
 <script lang='ts'>
@@ -222,6 +221,46 @@ export default defineComponent({
 
 
 <style lang='less' scoped>
+.card-item {
+  margin: 5px;
+  background-color: rgb(250 250 250);
+}
+
+.columns div.drag {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: wrap;
+  align-content: flex-start;
+  // min-height: 10vh;
+  max-height: 15vh;
+  overflow: auto;
+
+  > div {
+    // margin-left: 1px;
+    margin: 2px;
+    // margin-top: 2px;
+  }
+}
+.get_drag() {
+  div.drag {
+    min-height: 5vh;
+    // max-height: 25vh;
+    overflow: auto;
+
+    > div {
+      margin-bottom: 2px;
+    }
+  }
+}
+
+.keys {
+  .get_drag();
+}
+
+.agg {
+  .get_drag();
+}
+
 div.apply-btn {
   width: 200px;
   margin: 0 auto;
@@ -230,44 +269,22 @@ div.apply-btn {
 div.container {
   display: flex;
   flex-direction: row;
-  align-items: stretch;
+  align-items: flex-start;
 
   // height: 20vh;
 
-  div.content {
-    height: 100%;
-
-    > .drag {
-      height: 80%;
-    }
-  }
-
   > div {
-    border: 1px solid black;
-
     &.columns {
       flex-grow: 0.5;
     }
 
     &.keys {
-      flex-grow: 0.5;
+      flex-grow: 0;
     }
 
     &.agg {
-      flex-grow: 1;
+      flex-grow: 0.5;
     }
   }
 }
-
-div.drag {
-  display: flex;
-  flex-direction: column;
-  flex-wrap: wrap;
-  max-height: 40vh;
-  overflow: auto;
-
-  > div {
-    margin: 2px;
-  }
-}
 </style>
\ No newline at end of file
diff --git a/ui/src/components/FunctionTabs/Query/index.vue b/ui/src/components/FunctionTabs/Query/index.vue
index 7adcd94..5843565 100644
--- a/ui/src/components/FunctionTabs/Query/index.vue
+++ b/ui/src/components/FunctionTabs/Query/index.vue
@@ -3,12 +3,11 @@
     <a-auto-complete
       class="input"
       :options="opts"
-      allow-clear
       v-model:value="input"
-      placeholder="dataframe.query 的 内容"
+      placeholder="dataframe.query 的内容"
       @search="onSearch"
       @select="onSelect"
-      :defaultOpen="true"
+      :autofocus="true"
     />
 
     <a-button type="primary" @click="onApply" :disabled="!applyBtnDisplay"
@@ -26,7 +25,7 @@ export default defineComponent({
   name: "Query",
 
   setup() {
-    let input = ref(" ");
+    let input = ref("");
     let applyBtnDisplay = computed(() => input.value.length > 0);
 
     const opts = ref([] as object);
diff --git a/ui/src/components/FunctionTabs/index.vue b/ui/src/components/FunctionTabs/index.vue
index a51fa6d..97b5caf 100644
--- a/ui/src/components/FunctionTabs/index.vue
+++ b/ui/src/components/FunctionTabs/index.vue
@@ -1,24 +1,29 @@
 <template>
   <a-tabs class="tabs">
-    <a-tab-pane key="1" tab="加载">
+    <a-tab-pane class="pane" key="1" tab="加载">
       <FileUpload></FileUpload>
     </a-tab-pane>
 
-    <a-tab-pane v-if="isDev" key="test" tab="test"> </a-tab-pane>
+    <a-tab-pane class="pane" v-if="isDev" key="test" tab="test"> </a-tab-pane>
 
-    <a-tab-pane key="CodeBuilder" tab="代码生成" :disabled="!isDataLoaded">
+    <a-tab-pane
+      class="pane"
+      key="CodeBuilder"
+      tab="代码生成"
+      :disabled="!isDataLoaded"
+    >
       <CodeBuilder></CodeBuilder>
     </a-tab-pane>
 
-    <a-tab-pane key="2" tab="筛选" :disabled="!isDataLoaded">
+    <a-tab-pane class="pane" key="2" tab="筛选" :disabled="!isDataLoaded">
       <Query></Query>
     </a-tab-pane>
 
-    <a-tab-pane key="3" tab="分组" :disabled="!isDataLoaded">
+    <a-tab-pane class="pane" key="3" tab="分组" :disabled="!isDataLoaded">
       <Groupby></Groupby>
     </a-tab-pane>
 
-    <a-tab-pane key="4" tab="透视表" :disabled="!isDataLoaded"
+    <a-tab-pane class="pane" key="4" tab="透视表" :disabled="!isDataLoaded"
       >期待！！！！</a-tab-pane
     >
   </a-tabs>
@@ -67,6 +72,13 @@ export default defineComponent({
 </script>
 
 
+<style lang="less" scoped>
+div.pane {
+  max-height: 35vh;
+  overflow: auto;
+}
+</style>
+
 
 
 
diff --git a/ui/src/index.css b/ui/src/index.css
new file mode 100644
index 0000000..9a059b2
--- /dev/null
+++ b/ui/src/index.css
@@ -0,0 +1,20 @@
+#app {
+    font-family: Avenir, Helvetica, Arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    text-align: center;
+    color: #2c3e50;
+    /* max-width: 1170px; */
+    margin-left: auto;
+    margin-right: auto;
+    padding-left: 0;
+    padding-right: 0;
+    box-sizing: border-box;
+}
+
+.wrapper {
+    width: 95%;
+    max-width: 1841px;
+    margin-left: auto;
+    margin-right: auto;
+}
diff --git a/ui/src/main.ts b/ui/src/main.ts
index 2101017..83d7e55 100644
--- a/ui/src/main.ts
+++ b/ui/src/main.ts
@@ -1,5 +1,6 @@
 import { createApp } from 'vue'
 import App from './App.vue'
+import './index.css'
 
 import "./mock";
 
diff --git a/ui/src/plugins/vant.ts b/ui/src/plugins/vant.ts
index 49be5e1..bd9a751 100644
--- a/ui/src/plugins/vant.ts
+++ b/ui/src/plugins/vant.ts
@@ -3,7 +3,7 @@ import { App } from "vue";
 import {
     Button, Form, Tabs, Tag, Steps, AutoComplete, Table,
     Input, Popover, Select, Upload, Divider,
-    Descriptions, Popconfirm, Spin, Modal, Result, Empty, InputNumber
+    Descriptions, Popconfirm, Spin, Modal, Result, Empty, InputNumber, Card, Affix
 } from "ant-design-vue";
 
 import { InboxOutlined, StarFilled } from '@ant-design/icons-vue';
@@ -15,7 +15,7 @@ export default {
     install: (app: App) => {
         [Button, Form, Tabs, Tag, Steps, AutoComplete,
             Input, Popover, Select, Upload, Divider,
-            Descriptions, Popconfirm, Spin, Modal, Result, Empty, InputNumber, Table].forEach(v => app.use(v));
+            Descriptions, Popconfirm, Spin, Modal, Result, Empty, InputNumber, Affix, Table, Card].forEach(v => app.use(v));
 
         app.component('inboxOutlined', InboxOutlined)
     }
-- 
Gitee


From 801543acb8db008a5f39d13dacf58eeed0c30431 Mon Sep 17 00:00:00 2001
From: carson_git <543983849@qq.com>
Date: Wed, 16 Dec 2020 16:42:01 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 py/build/build.bat                            |  3 ++
 py/{ => build}/build.py                       | 40 +++++++++++--------
 py/build/others/startup_linux.sh              |  1 +
 py/build/others/startup_win.bat               |  2 +
 ...3\347\273\237\350\246\201\346\261\202.txt" | 13 ++++++
 py/startup.bat                                |  1 -
 6 files changed, 42 insertions(+), 18 deletions(-)
 create mode 100644 py/build/build.bat
 rename py/{ => build}/build.py (52%)
 create mode 100644 py/build/others/startup_linux.sh
 create mode 100644 py/build/others/startup_win.bat
 create mode 100644 "py/build/others/\347\263\273\347\273\237\350\246\201\346\261\202.txt"
 delete mode 100644 py/startup.bat

diff --git a/py/build/build.bat b/py/build/build.bat
new file mode 100644
index 0000000..af93c97
--- /dev/null
+++ b/py/build/build.bat
@@ -0,0 +1,3 @@
+call activate py36
+python build.py
+pause
\ No newline at end of file
diff --git a/py/build.py b/py/build/build.py
similarity index 52%
rename from py/build.py
rename to py/build/build.py
index 4263fd7..f1d865b 100644
--- a/py/build.py
+++ b/py/build/build.py
@@ -1,28 +1,28 @@
+import sys
 import compileall
 import pathlib as plib
 import shutil
 import os
 
-m_dist_app_path = plib.Path('dist/app')
+os.chdir(plib.Path(__file__).parent)
+
+vinfo = sys.version_info
+
+
+m_dist_app_path = plib.Path(f'../dist/app{vinfo.major}{vinfo.minor}')
 m_dist_src_path = m_dist_app_path / 'src'
 m_dist_web_path = m_dist_app_path / 'web'
 m_dist_main_path = m_dist_app_path / 'main.pyc'
 m_dist_startup_path = m_dist_app_path / 'startup.bat'
 
-compileall.compile_dir(r'src')
-compileall.compile_file('main.py')
+compileall.compile_dir(r'../src')
+compileall.compile_file('../main.py')
 print('编译完毕')
 
-if os.path.exists(m_dist_src_path):
-    shutil.rmtree(m_dist_src_path)
-
-if os.path.exists(m_dist_web_path):
-    shutil.rmtree(m_dist_web_path)
+if os.path.exists(m_dist_app_path):
+    shutil.rmtree(m_dist_app_path)
 
-if os.path.exists(m_dist_main_path):
-    os.remove(m_dist_main_path)
-
-os.makedirs(m_dist_src_path)
+os.makedirs(m_dist_app_path)
 
 print('清除旧文件完毕')
 
@@ -37,11 +37,14 @@ def to_folder(file: plib.Path):
     del parts[-2]
     parts[-1] = to_fileName(file)
     # parts = [plib.Path(p) for p in parts]
+
+    parts = [p for p in parts if not all(s in ['.', '/'] for s in p)]
+
     parts = plib.Path.joinpath(m_dist_app_path, *parts)
     return parts
 
 
-fs = plib.Path('src').rglob('*.cpython-37.pyc')
+fs = plib.Path('../src').rglob('*.cpython-37.pyc')
 fs = [(p, to_folder(p)) for p in fs]
 
 for f in fs:
@@ -51,10 +54,13 @@ for f in fs:
     shutil.copyfile(f[0], f[1])
 
 
-shutil.copyfile('__pycache__/main.cpython-37.pyc', m_dist_main_path)
+shutil.copyfile('../__pycache__/main.cpython-37.pyc', m_dist_main_path)
+
+shutil.copytree('../web', m_dist_web_path)
 
-shutil.copytree('web', m_dist_web_path)
 
-shutil.copyfile('startup.bat', m_dist_startup_path)
+for f in plib.Path('others').glob('*'):
+    shutil.copyfile(f, m_dist_app_path / f.name)
+# shutil.copyfile('../startup.bat', m_dist_startup_path)
 
-print('创建完成')
+print(f'创建完成-({vinfo})')
diff --git a/py/build/others/startup_linux.sh b/py/build/others/startup_linux.sh
new file mode 100644
index 0000000..268f2c6
--- /dev/null
+++ b/py/build/others/startup_linux.sh
@@ -0,0 +1 @@
+python main.pyc
\ No newline at end of file
diff --git a/py/build/others/startup_win.bat b/py/build/others/startup_win.bat
new file mode 100644
index 0000000..48f3210
--- /dev/null
+++ b/py/build/others/startup_win.bat
@@ -0,0 +1,2 @@
+python  main.pyc
+pause
\ No newline at end of file
diff --git "a/py/build/others/\347\263\273\347\273\237\350\246\201\346\261\202.txt" "b/py/build/others/\347\263\273\347\273\237\350\246\201\346\261\202.txt"
new file mode 100644
index 0000000..586120c
--- /dev/null
+++ "b/py/build/others/\347\263\273\347\273\237\350\246\201\346\261\202.txt"
@@ -0,0 +1,13 @@
+python 3.6 或以上
+
+python 必需的库：
+- flask
+- pandas
+- webbrowser(应该是py内置的库)
+
+执行如下语句安装（使用了国内镜像）：
+pip install pandas flask -i https://mirrors.aliyun.com/pypi/simple/
+
+
+浏览器要求：
+基本上市面上的主流浏览器都支持，IE就不考虑了
\ No newline at end of file
diff --git a/py/startup.bat b/py/startup.bat
deleted file mode 100644
index 7b67459..0000000
--- a/py/startup.bat
+++ /dev/null
@@ -1 +0,0 @@
-python  main.py
\ No newline at end of file
-- 
Gitee


From 1f5cfa3c186905c4c38f9b91b91f36436d56de20 Mon Sep 17 00:00:00 2001
From: carson_git <543983849@qq.com>
Date: Wed, 16 Dec 2020 17:09:35 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8C=BA=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=B7=A6=E5=AF=B9=E9=BD=90=EF=BC=8C=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B2=A1=E6=9C=89=E5=B8=A6=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=E7=AC=A6=E7=9A=84bug=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/FunctionTabs/CodeBuilder/index.vue | 10 ++++++----
 ui/src/mock/code.json                                |  3 +++
 ui/src/mock/index.ts                                 |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 ui/src/mock/code.json

diff --git a/ui/src/components/FunctionTabs/CodeBuilder/index.vue b/ui/src/components/FunctionTabs/CodeBuilder/index.vue
index ce90761..cfa55c9 100644
--- a/ui/src/components/FunctionTabs/CodeBuilder/index.vue
+++ b/ui/src/components/FunctionTabs/CodeBuilder/index.vue
@@ -1,8 +1,7 @@
 <template>
-  <div class="wrapper context_wrapper">
-    <code id="code">
+  <div class="wrapper">
+    <code id="code" class="context_wrapper">
       <pre>{{ code }}</pre>
-      <!-- <textarea>{{ code }}</textarea> -->
     </code>
 
     <a-button type="primary" @click="onCopy">复制</a-button>
@@ -21,7 +20,7 @@ export default defineComponent({
     let code = CodeBuilderStore.getStateToRefs().code;
 
     let onCopy = () => {
-      let inp = document.createElement("input");
+      let inp = document.createElement("textarea");
       inp.value = code.value;
       document.body.appendChild(inp);
       inp.select(); // 选择对象;
@@ -42,4 +41,7 @@ export default defineComponent({
 </script>
 
 <style lang="less" scoped>
+code.context_wrapper {
+  text-align: left;
+}
 </style>
\ No newline at end of file
diff --git a/ui/src/mock/code.json b/ui/src/mock/code.json
new file mode 100644
index 0000000..ad35c3f
--- /dev/null
+++ b/ui/src/mock/code.json
@@ -0,0 +1,3 @@
+{
+    "code": "df = pd.read_excel('某咖啡公司销售数据.xlsx',sheet_name = 0,header = 0)\ncond = df.eval(\"(产品类别 in ['普茶', 'Espresso']) and (市场类别 == 'Major Market')\")\ndf = df[cond]"
+}
\ No newline at end of file
diff --git a/ui/src/mock/index.ts b/ui/src/mock/index.ts
index ee85920..3594f01 100644
--- a/ui/src/mock/index.ts
+++ b/ui/src/mock/index.ts
@@ -14,6 +14,7 @@ import cmds from "./commandersModel.json";
 
 import file_upload from '@/mock/file_upload.json';
 
+import code from '@/mock/code.json';
 
 import test_json from "./test.json";
 
@@ -56,7 +57,7 @@ export default function autoLoadData() {
         DfStore.setData(table.table.fields, table.table.data, table.columnInfos)
         PandasCmdStore.SetCorrect()
 
-        CodeBuilderStore.update("df = pd.read_excel(<FileStorage: 'test.xlsx' ('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')>,sheetName = 0,header = 0)")
+        CodeBuilderStore.update(code.code)
 
         CommandStore.setData(cmds)
 
-- 
Gitee