From 62e3a350939d2c12b2f11c30b670654262781e9b Mon Sep 17 00:00:00 2001
From: mengyxu <kekeningxiaobai@sina.com>
Date: Thu, 21 Nov 2024 10:59:33 +0800
Subject: [PATCH] 0.4.1

---
 examples/view/base/table.vue      |  2 +-
 package.json                      |  2 +-
 packages/base/data/list-table.vue | 10 +++++++++-
 packages/manage/common/login.vue  | 18 ++++++++++++++++--
 packages/manage/common/login2.vue | 20 ++++++++++++++++++--
 plugs/api/base.ts                 | 13 +++++++++++++
 plugs/config/size/large.ts        |  2 ++
 plugs/config/size/normal.ts       |  1 +
 plugs/config/size/small.ts        |  1 +
 plugs/i18n/zh.ts                  |  2 +-
 10 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/examples/view/base/table.vue b/examples/view/base/table.vue
index 499c8fd..a10a766 100644
--- a/examples/view/base/table.vue
+++ b/examples/view/base/table.vue
@@ -6,7 +6,7 @@
             <NoobSelect v-model="example.ccc" stateProp="test" :width="120"></NoobSelect>
         </template>
     </SearchRow>
-    <ListTable :data="data" :props="prop" :page="true"></ListTable>
+    <ListTable :data="data" :props="prop" :page="true" :border="true"></ListTable>
     <br />
     <br />
     <Infomation :num="100" title="总数" icon="DataAnalysis"></Infomation>
diff --git a/package.json b/package.json
index 53b0fc0..e84248a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "noob-mengyxu",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "main": "index.ts",
     "module": "index.ts",
     "keywords": [
diff --git a/packages/base/data/list-table.vue b/packages/base/data/list-table.vue
index 583e226..214a2cc 100644
--- a/packages/base/data/list-table.vue
+++ b/packages/base/data/list-table.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="my-table">
         <el-table ref="table" :size="state.size.size" :data="page ? data.data : data"
-            @selection-change="selectionChange"
+            @selection-change="selectionChange" :border="border"
             :height="height || (page ? state.size.pTableHeight : state.size.tableHeight)" highlight-current-row
             :row-key="rowKey" :tree-porps="treeProps" :lazy="lazy" :load="load">
 
@@ -76,6 +76,10 @@ const prop = defineProps({
         type: Boolean,
         default: false,
     },
+    border: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const emit = defineEmits(["query", "selection-change"]);
@@ -194,6 +198,10 @@ onUpdated(() => {
     background: v-bind('state.style.tableChildBg') !important;
 }
 
+::v-deep .el-table .el-table__cell {
+    padding: v-bind('state.size.tablePad') 0px;
+}
+
 .my-pagination * {
     --el-pagination-bg-color: v-bind('state.style.bodyBg') !important;
     --el-pagination-disabled-bg-color: v-bind('state.style.bodyBg') !important;
diff --git a/packages/manage/common/login.vue b/packages/manage/common/login.vue
index 7471170..dc760f9 100644
--- a/packages/manage/common/login.vue
+++ b/packages/manage/common/login.vue
@@ -23,7 +23,7 @@
 
 <script lang="ts" setup>
 import { useStore } from "vuex";
-import { onBeforeMount, onMounted, ref } from "vue";
+import { onBeforeMount,onBeforeUnmount, onMounted, ref } from "vue";
 import { useRouter } from "vue-router";
 import { FormInstance } from "element-plus";
 import { Api, NoobInput, NoobButton, Element } from "noob-mengyxu";
@@ -68,6 +68,7 @@ const loginConfirm = user => {
             commit("initSize");
             dispatch("getMenus");
             router.back();
+            document.removeEventListener('keyup', enter_up);
         }
     })
 };
@@ -81,8 +82,21 @@ const login = () => {
         }
     });
 }
+const enter_up = (e) => {
+    console.log(e);
+    
+    if (e.keyCode == 13 || e.keyCode == 100) {
+        login();
+    }
+}
 
-onMounted(() => { });
+onMounted(() => {
+    document.addEventListener('keyup', enter_up);
+});
+
+onBeforeUnmount(() => {
+    document.removeEventListener('keyup', enter_up);
+});
 </script>
 <style lang="scss" scoped>
 .login {
diff --git a/packages/manage/common/login2.vue b/packages/manage/common/login2.vue
index 16c0ef8..f8365b7 100644
--- a/packages/manage/common/login2.vue
+++ b/packages/manage/common/login2.vue
@@ -22,7 +22,7 @@
 
 <script lang="ts" setup>
 import { useStore } from "vuex";
-import { onBeforeMount, onMounted, ref } from "vue";
+import { onBeforeMount, onMounted, ref, onBeforeUnmount } from "vue";
 import { useRouter } from "vue-router";
 import { FormInstance } from "element-plus";
 import { Api, NoobInput, NoobButton, Element } from "noob-mengyxu";
@@ -67,6 +67,7 @@ const loginConfirm = user => {
             commit("initSize");
             dispatch("getMenus");
             router.back();
+            document.removeEventListener('keyup', enter_up);
         }
     })
 };
@@ -81,7 +82,22 @@ const login = () => {
     });
 }
 
-onMounted(() => { });
+const enter_up = (e) => {
+    console.log(e);
+    
+    if (e.keyCode == 13 || e.keyCode == 100) {
+        login();
+    }
+}
+
+onMounted(() => {
+    document.addEventListener('keyup', enter_up);
+});
+
+onBeforeUnmount(() => {
+    document.removeEventListener('keyup', enter_up);
+});
+
 </script>
 <style lang="scss" scoped>
 .login {
diff --git a/plugs/api/base.ts b/plugs/api/base.ts
index 4f71469..80796ab 100644
--- a/plugs/api/base.ts
+++ b/plugs/api/base.ts
@@ -36,6 +36,19 @@ export const queryList = (url, example?) => {
   });
 };
 
+export const getById = (url, id) => {
+  return new Promise((resolve, reject) => {
+    get(url + '/' + id).then(
+      (rsp: any) => {
+        resolve(rsp || {});
+      },
+      (err) => {
+        resolve({});
+      }
+    );
+  });
+};
+
 export const save = (url, role) => {
   return new Promise((resolve, reject) => {
     post(url, role).then(
diff --git a/plugs/config/size/large.ts b/plugs/config/size/large.ts
index 2f43aa7..0d58d74 100644
--- a/plugs/config/size/large.ts
+++ b/plugs/config/size/large.ts
@@ -17,4 +17,6 @@ export default class Small extends Normal {
   searchRowHeight = '45px'; //查询行高
   searchRowPad = '12px'; //查询行内间距
   searchWidth = '190px'; //查询元素默认宽度
+
+  tablePad = '8px';
 }
diff --git a/plugs/config/size/normal.ts b/plugs/config/size/normal.ts
index 3a8068c..c85270b 100644
--- a/plugs/config/size/normal.ts
+++ b/plugs/config/size/normal.ts
@@ -26,4 +26,5 @@ export default class Normal {
   tableHeight = 0; //表格默认高度
   pTableHeight = 0; //带分页表格默认高度
   pageHeight = 36; //分页插件高度
+  tablePad = '4px';
 }
diff --git a/plugs/config/size/small.ts b/plugs/config/size/small.ts
index ca02a5c..04bef27 100644
--- a/plugs/config/size/small.ts
+++ b/plugs/config/size/small.ts
@@ -19,4 +19,5 @@ export default class Small extends Normal {
   searchWidth = '150px'; //查询元素默认宽度
 
   pageHeight = 28; //分页插件高度
+  tablePad = '2px';
 }
diff --git a/plugs/i18n/zh.ts b/plugs/i18n/zh.ts
index 46bea48..ad06892 100644
--- a/plugs/i18n/zh.ts
+++ b/plugs/i18n/zh.ts
@@ -35,7 +35,7 @@ export default class Zh {
     noSpace: '密码不能包含空格',
     required: '密码至少包含大小写字母和数字',
   };
-  styles = ['默认', '明亮', '黑夜', '默认2'];
+  styles = ['青', '明亮', '黑夜', '蓝'];
 
   head = {
     center: '个人中心',