Merge branch 'main' into production

frontend/components.d.ts

@@ -27,7 +27,6 @@ declare module '@vue/runtime-core' {
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']

frontend/src/components/manage-list.vue

@@ -5,9 +5,9 @@
             <!-- 筛选 -->
             <div class="handle-box">
                 <template v-for="field in searchFields">
-                    <el-input v-if="field.searchType == 'input'" v-model="query[field.field]"
-                        @keyup.enter.native="handleSearch" :placeholder="field.placeholder" :prefix-icon="Filter"
-                        class="handle-input mr10"></el-input>
+                    <el-input v-if="field.searchType == 'input' || field.searchType == 'input-number'"
+                        v-model="query[field.field]" @keyup.enter.native="handleSearch" :placeholder="field.placeholder"
+                        :prefix-icon="Filter" class="handle-input mr10"></el-input>
                     <el-select v-else-if="field.searchType == 'select'" v-model="query[field.field]" :clearable="true"
                         @change="handleSearch" :placeholder="field.placeholder" class="handle-select mr10">
                         <template #prefix>
@@ -61,7 +61,7 @@
                     <template #default="scope">
                         <template v-if="props.customEditHandle">
                             <el-button text :icon="List"
-                                @click="props.customEditHandle((scope as any).$index, (scope as any).row, getData)"
+                                @click="props.customEditHandle?.((scope as any).$index, (scope as any).row, getData)"
                                 v-permiss="props.editPermiss">
                                 管理
                             </el-button>
@@ -98,6 +98,9 @@
                     <el-input v-if="(formId > 0 ? field.editType : field.addType) == 'input'"
                         :placeholder="formId > 0 ? field.editPlaceholder : field.addPlaceholder" class="popup-item"
                         v-model="form[field.field]"></el-input>
+                    <el-input v-else-if="(formId > 0 ? field.editType : field.addType) == 'input-number'" type="number"
+                        :placeholder="formId > 0 ? field.editPlaceholder : field.addPlaceholder" class="popup-item"
+                        v-model="form[field.field]"></el-input>
                     <el-input v-else-if="(formId > 0 ? field.editType : field.addType) == 'textarea'"
                         :placeholder="formId > 0 ? field.editPlaceholder : field.addPlaceholder" class="popup-item"
                         v-model="form[field.field]" type="textarea" :rows="4"></el-input>
@@ -396,7 +399,8 @@ const handleEdit = (index: number, row: any) => {
     for (let f of dialogFields.value) {
         switch (f.editType) {
             case "select":
-                // 下拉框的值要为 string 类型
+            case "input-number":
+                // 下拉框、数字输入框的值要为 string 类型
                 form[f.field] = String(row[f.field]);
                 break;
             default:
@@ -416,7 +420,8 @@ const handleNew = () => {
     for (let f of dialogFields.value) {
         switch (f.editType) {
             case "select":
-                // 下拉框的值要为 string 类型
+            case "input-number":
+                // 下拉框、数字输入框的值要为 string 类型
                 form[f.field] = String(f.default);
                 break;
             default:

frontend/src/store/permiss.ts

@@ -15,17 +15,17 @@ export const usePermissStore = defineStore('permiss', {
 
                 "dashboard",
 
-                "access",
-                "access-log",
-                "access-gate-setting",
+                // "access",
+                // "access-log",
+                // "access-gate-setting",
 
-                "report",
-                "report-log",
+                // "report",
+                // "report-log",
 
-                "shop",
-                "shop-cate-setting",
-                "shop-good-setting",
-                "shop-order-setting",
+                // "shop",
+                // "shop-cate-setting",
+                // "shop-good-setting",
+                // "shop-order-setting",
 
                 "privilege",
                 "privilege-user-setting",
@@ -49,8 +49,8 @@ export const usePermissStore = defineStore('permiss', {
                 "shop-good-setting",
                 "shop-order-setting",
 
-                "privilege",
-                "privilege-user-setting",
+                // "privilege",
+                // "privilege-user-setting",
             ]
         };
     },

frontend/src/views/login.vue

@@ -67,8 +67,8 @@ interface RoleInfo {
 
 const router = useRouter();
 const param = reactive<LoginInfo>({
-    username: 'root',
-    password: 'root'
+    username: 'admin',
+    password: 'admin'
 });
 
 const rules: FormRules = {