From abce92de5ed4b406f5eb568be66d67edbead57e4 Mon Sep 17 00:00:00 2001
From: mengyxu <kekeningxiaobai@sina.com>
Date: Mon, 22 Jan 2024 16:56:42 +0800
Subject: [PATCH] update

---
 package.json                       |  4 +--
 packages/base/data/list-table.vue  | 28 +++++++++++++++++-
 packages/base/data/login-form.vue  | 24 +++++++++++++++
 packages/base/data/modify-form.vue |  2 +-
 packages/base/item/datetime.vue    |  8 +++--
 packages/base/item/input.vue       | 13 ++++++++-
 packages/manage/common/head.vue    | 15 +++++++++-
 packages/manage/router/index.vue   |  7 ++++-
 plugs/element/message.ts           | 18 ++++++------
 plugs/i18n/en.ts                   | 47 ++++++------------------------
 plugs/i18n/zh.ts                   | 38 ++++--------------------
 11 files changed, 116 insertions(+), 88 deletions(-)

diff --git a/package.json b/package.json
index 1b9b977..6720386 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "noob-mengyxu",
-    "version": "0.2.6",
+    "version": "0.2.7",
     "main": "index.ts",
     "module": "index.ts",
     "keywords": [
@@ -32,7 +32,7 @@
     "dependencies": {
         "axios": "^0.19.2",
         "core-js": "^3.8.3",
-        "element-plus": "2.2.20",
+        "element-plus": "2.4.0",
         "vue": "^3.2.25",
         "vue-class-component": "^8.0.0-0",
         "vue-router": "^4.0.3",
diff --git a/packages/base/data/list-table.vue b/packages/base/data/list-table.vue
index c08ab6a..a06415b 100644
--- a/packages/base/data/list-table.vue
+++ b/packages/base/data/list-table.vue
@@ -6,7 +6,8 @@
 
             <el-table-column v-for="item in props" :key="item.code" :prop="item.code" :label="item.name || t(item.i18n)"
                 :type="item.type" :min-width="item.width" :width="item.type ? item.width : ''" :fixed="item.fixed"
-                :align="item.align ? item.align : 'center'" show-overflow-tooltip :formatter="formatter">
+                :align="item.align ? item.align : 'center'" show-overflow-tooltip
+                :formatter="item.stamp ? formatStamp : item.fileSize ? formatFileSize : formatter">
 
                 <template v-if="item.slot" #default="scope">
                     <slot :name="item.code" :row="scope.row"></slot>
@@ -95,6 +96,31 @@ const getValue = (
     return value;
 };
 
+const formatStamp = (row: any, column: any, value: any, index: number) => {
+    const date = new Date(value * 1000);
+    const month = date.getMonth() < 9 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+    const day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+    const hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
+    const minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+    const second = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
+    return date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
+};
+const formatFileSize = (row: any, column: any, value: any, index: number) => {
+    const k = value / 1024;
+    if (k < 1) {
+        return value + "B";
+    }
+    const m = k / 1024;
+    if (m < 1) {
+        return k.toFixed(2) + "K";
+    }
+    const g = m / 1024;
+    if (g < 1) {
+        return m.toFixed(2) + "M";
+    }
+    return g.toFixed(2) + "G";
+};
+
 const formatter = (row: any, column: any, value: any, index: number) => {
     if (row.scheme)
         return formatterByDist(row.scheme + '_' + column.property, value);
diff --git a/packages/base/data/login-form.vue b/packages/base/data/login-form.vue
index c3df3ac..ed22976 100644
--- a/packages/base/data/login-form.vue
+++ b/packages/base/data/login-form.vue
@@ -1,5 +1,8 @@
 <template>
     <el-form label-position="right" class="login-form" :model="param" ref="loginForm" :rules="rules">
+        <div class="logo-item" v-if="logo">
+            <el-image class="logo" :src="logo" fit="fit" />
+        </div>
         <el-form-item>
             <div class="lte-title"> {{ t('title') }} </div>
         </el-form-item>
@@ -35,6 +38,13 @@ const rules = {
     password: [new SimpleRequired('pwd.pwd')]
 }
 
+const props = defineProps({
+    logo: {
+        type: String,
+        default: null,
+    },
+});
+
 const login = () => {
     if (!loginForm.value) return;
     loginForm.value?.validate((valid, fields) => {
@@ -54,6 +64,20 @@ onMounted(() => { });
     height: v-bind('state.size.loginHeight');
 }
 
+.logo-item {
+    text-align: center;
+    align-items: center;
+}
+
+.logo {
+    width: 50px;
+    height: 50px;
+
+    img {
+        display: inline !important;
+    }
+}
+
 .lte-title {
     font-size: 1.5em;
     font-weight: bold;
diff --git a/packages/base/data/modify-form.vue b/packages/base/data/modify-form.vue
index b26bc35..6eb49e4 100644
--- a/packages/base/data/modify-form.vue
+++ b/packages/base/data/modify-form.vue
@@ -9,7 +9,7 @@
                 <NoobDate v-else-if="item.date" v-model="param[item.code]" :formater="item.formater" full
                     :placeholder="t('rule.pleaseSelect') + (item.name || t(item.i18n))" :disabled="item.disabled" />
                 <slot v-else-if="item.slot" :name="item.code" />
-                <NoobInput v-else v-model="param[item.code]" full :type="item.type"
+                <NoobInput v-else v-model="param[item.code]" full :type="item.type" :rows="items.rows"
                     :placeholder="t('rule.pleaseEnter') + (item.name || t(item.i18n))" :disabled="item.disabled" />
             </el-form-item>
             <slot></slot>
diff --git a/packages/base/item/datetime.vue b/packages/base/item/datetime.vue
index 0223f23..8632473 100644
--- a/packages/base/item/datetime.vue
+++ b/packages/base/item/datetime.vue
@@ -1,6 +1,6 @@
 <template>
     <el-date-picker :size="state.size.size" :class="['form-item', full && 'full']" :value-format="formater"
-        v-model="myValue" type="datetime" :placeholder="placeholder || t('rule.pleaseEnter')" :disabled="disabled"
+        v-model="myValue" :type="type" :placeholder="placeholder || t('rule.pleaseEnter')" :disabled="disabled"
         :clearable="clearable" :teleported="false" />
 </template>
 
@@ -17,6 +17,10 @@ const prop = defineProps({
         type: String,
         default: null
     },
+    type: {
+        type: String,
+        default: 'datetime'
+    },
     disabled: {
         type: Boolean,
         default: false,
@@ -31,7 +35,7 @@ const prop = defineProps({
     },
     formater: {
         type: String,
-        defaul: 'YYYY-MM-DDTHH:mm:ss'
+        defaul: 'YYYY-MM-DD HH:mm:ss'
     },
     width: {
         type: Number
diff --git a/packages/base/item/input.vue b/packages/base/item/input.vue
index 62efc46..cde3280 100644
--- a/packages/base/item/input.vue
+++ b/packages/base/item/input.vue
@@ -1,6 +1,8 @@
 <template>
     <el-input :size="state.size.size" :class="['form-item', full && 'full']" v-model="myValue" :type="type"
-        :placeholder="placeholder || t('rule.pleaseEnter')" :disabled="disabled" :clearable="clearable"></el-input>
+        :placeholder="placeholder || t('rule.pleaseEnter')" :disabled="disabled" :clearable="clearable">
+        <template v-if="label" #prepend>{{ label }}</template>
+    </el-input>
 </template>
 
 <script lang="ts" setup>
@@ -12,6 +14,10 @@ const { state } = useStore();
 
 const prop = defineProps({
     modelValue: null,
+    label: {
+        type: String,
+        default: null
+    },
     placeholder: {
         type: String,
         default: null
@@ -65,4 +71,9 @@ onMounted(() => {
 .form-item {
     width: v-bind('width');
 }
+
+::v-deep .el-input-group__prepend {
+    min-width: 20px;
+    padding: 0px 4px !important;
+}
 </style>
\ No newline at end of file
diff --git a/packages/manage/common/head.vue b/packages/manage/common/head.vue
index 646672c..1f71c2e 100644
--- a/packages/manage/common/head.vue
+++ b/packages/manage/common/head.vue
@@ -2,7 +2,10 @@
     <el-button v-if="closeAble" class="close-btn" :icon="isClose ? 'CaretRight' : 'CaretLeft'" circle
         :size="state.size.size" @click="close"></el-button>
     <div class="head">
-        <div class="title">{{ title || t('title') }}</div>
+        <div class="title">
+            <el-image class="logo" v-if="logo" :src="logo" fit="fit" />
+            {{ title || t('title') }}
+        </div>
         <div class="menu">
             <el-dropdown class="icon" :size="state.size.size" :teleported="false">
                 <el-button :size="state.size.size" icon="Avatar" circle></el-button>
@@ -135,6 +138,10 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
+    logo: {
+        type: String,
+        default: null,
+    },
 });
 
 const isClose = ref(false)
@@ -221,6 +228,12 @@ onMounted(() => { });
     height: v-bind('state.size.headHeight');
 }
 
+.logo {
+    float: left;
+    width: v-bind('state.size.headHeight');
+    height: v-bind('state.size.headHeight');
+}
+
 .title {
     height: v-bind('state.size.headHeight');
     width: v-bind('state.size.asideWidth');
diff --git a/packages/manage/router/index.vue b/packages/manage/router/index.vue
index be8a445..88a11b5 100644
--- a/packages/manage/router/index.vue
+++ b/packages/manage/router/index.vue
@@ -3,7 +3,8 @@
         <el-header v-show="state.size.headHeight != '0px'" class="app-head" :height="state.size.headHeight">
 
             <Head :title="title" @updatePwd="pwd => emit('updatePwd', pwd)" @logout="emit('logout')" :styleAble="styleAble"
-                :sizeAble="sizeAble" :langAble="langAble" :center="center" :username="username" :closeAble="closeAble" />
+                :sizeAble="sizeAble" :langAble="langAble" :center="center" :username="username" :closeAble="closeAble"
+                :logo="logo" />
         </el-header>
         <el-container id="container">
             <el-aside v-show="state.size.asideWidth != '0px'" :width="state.size.asideWidth">
@@ -76,6 +77,10 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
+    logo: {
+        type: String,
+        default: null,
+    },
 });
 
 const onResize = () => {
diff --git a/plugs/element/message.ts b/plugs/element/message.ts
index fa889da..dd325ed 100644
--- a/plugs/element/message.ts
+++ b/plugs/element/message.ts
@@ -75,18 +75,18 @@ export const confirm = (msg: string, title: string) => {
       confirmButtonClass: 'el-button--info',
       type: 'warning',
     })
-      .then(resolve)
+      .then(() => {
+        resolve(true);
+      })
       .catch((error) => {
-        if (reject != null) {
-          reject(error);
-        }
+        resolve(false);
       });
   });
 };
 
 export const prompt = (msg: string, title: string, pattern: RegExp, errorMsg: string) => {
   return new Promise((resolve, reject) => {
-    ElMessageBox.confirm(msg, title, {
+    ElMessageBox.prompt(msg, title, {
       confirmButtonText: t('base.confirm'),
       cancelButtonText: t('base.cancel'),
       buttonSize: 'default',
@@ -94,11 +94,11 @@ export const prompt = (msg: string, title: string, pattern: RegExp, errorMsg: st
       inputPattern: pattern,
       inputErrorMessage: errorMsg,
     })
-      .then(resolve)
+      .then((result) => {
+        resolve(result.value);
+      })
       .catch((error) => {
-        if (reject != null) {
-          reject(error);
-        }
+        resolve(false);
       });
   });
 };
diff --git a/plugs/i18n/en.ts b/plugs/i18n/en.ts
index d6bb595..78f2bb6 100644
--- a/plugs/i18n/en.ts
+++ b/plugs/i18n/en.ts
@@ -8,6 +8,8 @@ export default class English {
     modify: 'Modify',
     stop: 'Stop',
     select: 'Select',
+    refresh: 'Refresh',
+    save: 'Save',
     confirm: 'Confirm',
     cancel: 'Cancel',
     loading: 'Loading...',
@@ -29,8 +31,7 @@ export default class English {
     rePwdError: 'The password is entered twice inconsistently',
     length: 'The password length is: {0}~{1} characters',
     noSpace: 'The password cannot contain spaces',
-    required:
-      'The password contains at least uppercase and lowercase letters and numbers',
+    required: 'The password contains at least uppercase and lowercase letters and numbers',
   };
 
   head = {
@@ -75,37 +76,19 @@ export default class English {
   };
 
   http = {
-    unPermission:
-      'You do not have access yet, please contact your administrator to add it',
-    noPermission:
-      'This permission is not yet open, do not access without permission',
+    unPermission: 'You do not have access yet, please contact your administrator to add it',
+    noPermission: 'This permission is not yet open, do not access without permission',
     error: 'Network error',
     downFail: 'Download failed with network abnormality！',
   };
 
   preMenu = {
-    operator: [
-      'Buffer',
-      'Config',
-      'Dictionary',
-      'Permission',
-      'Role',
-      'Status',
-      'Log',
-    ],
+    operator: ['Buffer', 'Config', 'Dictionary', 'Permission', 'Role', 'Status', 'Log'],
   };
 
   log = {
     title: 'Action log list',
-    prop: [
-      'Sequence',
-      'Action user',
-      'Log module',
-      'Action type',
-      'Action time',
-      'Login IP',
-      'Log content',
-    ],
+    prop: ['Sequence', 'Action user', 'Log module', 'Action type', 'Action time', 'Login IP', 'Log content'],
     start: 'Start time',
     stop: 'Stop time',
   };
@@ -115,26 +98,14 @@ export default class English {
     name: ' type/dictionary',
     prop: ['Name', 'Code', 'Description', 'Status', 'Action'],
     example: ['Type name(Fuzzy queries)', 'Type code', 'Status'],
-    delete: [
-      'Confirm whether to delete the dictionary/dictionary type (deleting a dictionary type deletes all dictionaries under that type)?',
-      'Tips',
-    ],
+    delete: ['Confirm whether to delete the dictionary/dictionary type (deleting a dictionary type deletes all dictionaries under that type)?', 'Tips'],
   };
 
   permission = {
     title: 'Permission manage',
     name: 'permission',
     parent: 'Permission parent',
-    prop: [
-      'Name',
-      'Code',
-      'Icon',
-      'Level',
-      'Priority',
-      'Status',
-      'Content',
-      'Action',
-    ],
+    prop: ['Name', 'Code', 'Icon', 'Level', 'Priority', 'Status', 'Content', 'Action'],
     example: ['Permission code'],
     delete: ['Are you sure you want to remove the permission?', 'Tips'],
   };
diff --git a/plugs/i18n/zh.ts b/plugs/i18n/zh.ts
index d2ad413..74851e5 100644
--- a/plugs/i18n/zh.ts
+++ b/plugs/i18n/zh.ts
@@ -8,6 +8,8 @@ export default class Zh {
     modify: '修改',
     stop: '停止',
     select: '查询',
+    refresh: '刷新',
+    save: '保存',
     confirm: '确认',
     cancel: '取消',
     loading: '加载中...',
@@ -81,28 +83,12 @@ export default class Zh {
   };
 
   preMenu = {
-    operator: [
-      '缓存管理',
-      '系统配置',
-      '数据字典',
-      '权限管理',
-      '角色管理',
-      '状态管理',
-      '接口日志',
-    ],
+    operator: ['缓存管理', '系统配置', '数据字典', '权限管理', '角色管理', '状态管理', '接口日志'],
   };
 
   log = {
     title: '接口日志查询',
-    prop: [
-      '序号',
-      '操作用户',
-      '日志模块',
-      '操作类型',
-      '操作时间',
-      '登录IP',
-      '日志信息',
-    ],
+    prop: ['序号', '操作用户', '日志模块', '操作类型', '操作时间', '登录IP', '日志信息'],
     start: '开始时间',
     stop: '结束时间',
   };
@@ -112,26 +98,14 @@ export default class Zh {
     name: '类型/字典',
     prop: ['字典名称', '字典编码', '字典说明', '字典状态', '操作'],
     example: ['字典类型名称(模糊查询)', '字典类型编码', '状态'],
-    delete: [
-      '确认是否删除该字典/字典类型(删除字典类型将删除该类型下所有字典)?',
-      '提示',
-    ],
+    delete: ['确认是否删除该字典/字典类型(删除字典类型将删除该类型下所有字典)?', '提示'],
   };
 
   permission = {
     title: '权限管理',
     name: '权限',
     parent: '父权限',
-    prop: [
-      '权限名称',
-      '权限编号',
-      '菜单图标',
-      '权限级别',
-      '排序优先级',
-      '权限状态',
-      '权限内容',
-      '操作',
-    ],
+    prop: ['权限名称', '权限编号', '菜单图标', '权限级别', '排序优先级', '权限状态', '权限内容', '操作'],
     example: ['权限编号'],
     delete: ['确定要删除该权限吗?', '提示'],
   };