Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web

commitlint.config.cjs

@@ -6,24 +6,7 @@ module.exports = {
     // @see https://commitlint.js.org/#/reference-rules
 
     // 提交类型枚举，git提交type必须是以下类型
-    "type-enum": [
+    'type-enum': [0],
-      2,
-      "always",
-      [
-        "feat", // 新增功能
-        "fix", // 修复缺陷
-        "docs", // 文档变更
-        "style", // 代码格式（不影响功能，例如空格、分号等格式修正）
-        "refactor", // 代码重构（不包括 bug 修复、功能新增）
-        "perf", // 性能优化
-        "test", // 添加疏漏测试或已有测试改动
-        "build", // 构建流程、外部依赖变更（如升级 npm 包、修改 webpack 配置等）
-        "ci", // 修改 CI 配置、脚本
-        "revert", // 回滚 commit
-        "chore", // 对构建过程或辅助工具和库的更改（不影响源文件、测试用例）
-        "wip", // 对构建过程或辅助工具和库的更改（不影响源文件、测试用例）
-      ],
-    ],
     "subject-case": [0], // subject大小写不做校验
   },
 

src/api/product/productclassification.ts

@@ -16,7 +16,7 @@ const AuthAPI = {
     return request<any, Responseres>({
       url: `${baseURL}`,
       method: "post",
-      data,
+      data: { ...data, sort: '1' },
     });
   },
   // 获取详情

src/components/CURD/PageContent.vue

@@ -8,58 +8,37 @@
           <template v-if="typeof item === 'string'">
             <!-- 新增 -->
             <template v-if="item === 'add'">
-              <el-button
+              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="success" icon="plus"
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                @click="handleToolbar(item)">
-                type="success"
-                icon="plus"
-                @click="handleToolbar(item)"
-              >
                 新增
               </el-button>
             </template>
             <!-- 删除 -->
             <template v-else-if="item === 'delete'">
-              <el-button
+              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="danger" icon="delete"
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                :disabled="removeIds.length === 0" @click="handleToolbar(item)">
-                type="danger"
-                icon="delete"
-                :disabled="removeIds.length === 0"
-                @click="handleToolbar(item)"
-              >
                 删除
               </el-button>
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'import'">
-              <el-button
+              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="upload"
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                @click="handleToolbar(item)">
-                type="default"
-                icon="upload"
-                @click="handleToolbar(item)"
-              >
                 导入
               </el-button>
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'export'">
-              <el-button
+              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="download"
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                @click="handleToolbar(item)">
-                type="default"
-                icon="download"
-                @click="handleToolbar(item)"
-              >
                 导出
               </el-button>
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
-            <el-button
+            <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon"
-              v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+              :type="item.type ?? 'default'" @click="handleToolbar(item.name)">
-              :icon="item.icon"
-              :type="item.type ?? 'default'"
-              @click="handleToolbar(item.name)"
-            >
               {{ item.text }}
             </el-button>
           </template>
@@ -88,68 +67,36 @@
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'exports'">
-              <el-button
+              <el-button v-hasPerm="[`${contentConfig.pageName}:export`]" icon="download" circle title="导出"
-                v-hasPerm="[`${contentConfig.pageName}:export`]"
+                @click="handleToolbar(item)" />
-                icon="download"
-                circle
-                title="导出"
-                @click="handleToolbar(item)"
-              />
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'imports'">
-              <el-button
+              <el-button v-hasPerm="[`${contentConfig.pageName}:import`]" icon="upload" circle title="导入"
-                v-hasPerm="[`${contentConfig.pageName}:import`]"
+                @click="handleToolbar(item)" />
-                icon="upload"
-                circle
-                title="导入"
-                @click="handleToolbar(item)"
-              />
             </template>
             <!-- 搜索 -->
             <template v-else-if="item === 'search'">
-              <el-button
+              <el-button v-hasPerm="[`${contentConfig.pageName}:query`]" icon="search" circle title="搜索"
-                v-hasPerm="[`${contentConfig.pageName}:query`]"
+                @click="handleToolbar(item)" />
-                icon="search"
-                circle
-                title="搜索"
-                @click="handleToolbar(item)"
-              />
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
             <template v-if="item.auth">
-              <el-button
+              <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon" circle
-                v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+                :title="item.title" @click="handleToolbar(item.name)" />
-                :icon="item.icon"
-                circle
-                :title="item.title"
-                @click="handleToolbar(item.name)"
-              />
             </template>
             <template v-else>
-              <el-button
+              <el-button :icon="item.icon" circle :title="item.title" @click="handleToolbar(item.name)" />
-                :icon="item.icon"
-                circle
-                :title="item.title"
-                @click="handleToolbar(item.name)"
-              />
             </template>
           </template>
         </template>
       </div>
     </div>
     <!-- 列表 -->
-    <el-table
+    <el-table ref="tableRef" v-loading="loading" v-bind="contentConfig.table" :data="pageData" :row-key="pk"
-      ref="tableRef"
+      @selection-change="handleSelectionChange" @filter-change="handleFilterChange">
-      v-loading="loading"
-      v-bind="contentConfig.table"
-      :data="pageData"
-      :row-key="pk"
-      @selection-change="handleSelectionChange"
-      @filter-change="handleFilterChange"
-    >
       <template v-for="col in cols" :key="col">
         <el-table-column v-if="col.show" v-bind="col">
           <template #default="scope">
@@ -158,24 +105,15 @@
               <template v-if="col.prop">
                 <template v-if="Array.isArray(scope.row[col.prop])">
                   <template v-for="(item, index) in scope.row[col.prop]" :key="item">
-                    <el-image
+                    <el-image :src="item" :preview-src-list="scope.row[col.prop]" :initial-index="index"
-                      :src="item"
+                      :preview-teleported="true" :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40
-                      :preview-src-list="scope.row[col.prop]"
+                        }px`" />
-                      :initial-index="index"
-                      :preview-teleported="true"
-                      :style="`width: ${col.imageWidth ?? 40}px; height: ${
-                        col.imageHeight ?? 40
-                      }px`"
-                    />
                   </template>
                 </template>
                 <template v-else>
-                  <el-image
+                  <el-image :src="scope.row[col.prop]" :preview-src-list="[scope.row[col.prop]]"
-                    :src="scope.row[col.prop]"
-                    :preview-src-list="[scope.row[col.prop]]"
                     :preview-teleported="true"
-                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`"
+                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`" />
-                  />
                 </template>
               </template>
             </template>
@@ -197,30 +135,20 @@
             <template v-else-if="col.templet === 'switch'">
               <template v-if="col.prop">
                 <!-- pageData.length>0: 解决el-switch组件会在表格初始化的时候触发一次change事件 -->
-                <el-switch
+                <el-switch v-model="scope.row[col.prop]" :active-value="col.activeValue ?? 1"
-                  v-model="scope.row[col.prop]"
+                  :inactive-value="col.inactiveValue ?? 0" :inline-prompt="true" :active-text="col.activeText ?? ''"
-                  :active-value="col.activeValue ?? 1"
+                  :inactive-text="col.inactiveText ?? ''" :validate-event="false"
-                  :inactive-value="col.inactiveValue ?? 0"
+                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)" @change="
-                  :inline-prompt="true"
-                  :active-text="col.activeText ?? ''"
-                  :inactive-text="col.inactiveText ?? ''"
-                  :validate-event="false"
-                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
-                  @change="
                     pageData.length > 0 && handleModify(col.prop, scope.row[col.prop], scope.row)
-                  "
+                    " />
-                />
               </template>
             </template>
             <!-- 生成输入框组件 -->
             <template v-else-if="col.templet === 'input'">
               <template v-if="col.prop">
-                <el-input
+                <el-input v-model="scope.row[col.prop]" :type="col.inputType ?? 'text'"
-                  v-model="scope.row[col.prop]"
-                  :type="col.inputType ?? 'text'"
                   :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
-                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)"
+                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)" />
-                />
               </template>
             </template>
             <!-- 格式化为价格 -->
@@ -252,7 +180,7 @@
                 {{
                   scope.row[col.prop]
                     ? useDateFormat(scope.row[col.prop], col.dateFormat ?? "YYYY-MM-DD HH:mm:ss")
-                        .value
+                      .value
                     : ""
                 }}
               </template>
@@ -263,45 +191,30 @@
                 <template v-if="typeof item === 'string'">
                   <!-- 编辑/删除 -->
                   <template v-if="item === 'edit' || item === 'delete'">
-                    <el-button
+                    <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                      v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                      :type="item === 'edit' ? 'primary' : 'danger'" :icon="item" size="small" link @click="
-                      :type="item === 'edit' ? 'primary' : 'danger'"
-                      :icon="item"
-                      size="small"
-                      link
-                      @click="
                         handleOperat({
                           name: item,
                           row: scope.row,
                           column: scope.column,
                           $index: scope.$index,
                         })
-                      "
+                        ">
-                    >
                       {{ item === "edit" ? "编辑" : "删除" }}
                     </el-button>
                   </template>
                 </template>
                 <!-- 其他 -->
                 <template v-else-if="typeof item === 'object'">
-                  <el-button
+                  <el-button v-if="item.render === undefined || item.render(scope.row)" v-bind="item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
-                    v-if="item.render === undefined || item.render(scope.row)"
+                    " :icon="item.icon" :type="item.type ?? 'primary'" size="small" link @click="
-                    v-bind="
-                      item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
-                    "
-                    :icon="item.icon"
-                    :type="item.type ?? 'primary'"
-                    size="small"
-                    link
-                    @click="
                       handleOperat({
                         name: item.name,
                         row: scope.row,
                         column: scope.column,
                         $index: scope.$index,
                       })
-                    "
+                      ">
-                  >
                     {{ item.text }}
                   </el-button>
                 </template>
@@ -319,33 +232,18 @@
     <template v-if="showPagination">
       <el-scrollbar>
         <div class="mt-[12px]">
-          <el-pagination
+          <el-pagination v-bind="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-            v-bind="pagination"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
         </div>
       </el-scrollbar>
     </template>
     <!-- 导出弹窗 -->
-    <el-dialog
+    <el-dialog v-model="exportsModalVisible" :align-center="true" title="导出数据" width="600px" style="padding-right: 0"
-      v-model="exportsModalVisible"
+      @close="handleCloseExportsModal">
-      :align-center="true"
-      title="导出数据"
-      width="600px"
-      style="padding-right: 0"
-      @close="handleCloseExportsModal"
-    >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form
+        <el-form ref="exportsFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
-          ref="exportsFormRef"
+          :model="exportsFormData" :rules="exportsFormRules">
-          label-width="auto"
-          style="padding-right: var(--el-dialog-padding-primary)"
-          :model="exportsFormData"
-          :rules="exportsFormRules"
-        >
           <el-form-item label="文件名" prop="filename">
             <el-input v-model="exportsFormData.filename" clearable />
           </el-form-item>
@@ -355,16 +253,10 @@
           <el-form-item label="数据源" prop="origin">
             <el-select v-model="exportsFormData.origin">
               <el-option label="当前数据 (当前页的数据)" :value="ExportsOriginEnum.CURRENT" />
-              <el-option
+              <el-option label="选中数据 (所有选中的数据)" :value="ExportsOriginEnum.SELECTED"
-                label="选中数据 (所有选中的数据)"
+                :disabled="selectionData.length <= 0" />
-                :value="ExportsOriginEnum.SELECTED"
+              <el-option label="全量数据 (所有分页的数据)" :value="ExportsOriginEnum.REMOTE"
-                :disabled="selectionData.length <= 0"
+                :disabled="contentConfig.exportsAction === undefined" />
-              />
-              <el-option
-                label="全量数据 (所有分页的数据)"
-                :value="ExportsOriginEnum.REMOTE"
-                :disabled="contentConfig.exportsAction === undefined"
-              />
             </el-select>
           </el-form-item>
           <el-form-item label="字段" prop="fields">
@@ -385,35 +277,17 @@
       </template>
     </el-dialog>
     <!-- 导入弹窗 -->
-    <el-dialog
+    <el-dialog v-model="importModalVisible" :align-center="true" title="导入数据" width="600px" style="padding-right: 0"
-      v-model="importModalVisible"
+      @close="handleCloseImportModal">
-      :align-center="true"
-      title="导入数据"
-      width="600px"
-      style="padding-right: 0"
-      @close="handleCloseImportModal"
-    >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form
+        <el-form ref="importFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
-          ref="importFormRef"
+          :model="importFormData" :rules="importFormRules">
-          label-width="auto"
-          style="padding-right: var(--el-dialog-padding-primary)"
-          :model="importFormData"
-          :rules="importFormRules"
-        >
           <el-form-item label="文件名" prop="files">
-            <el-upload
+            <el-upload ref="uploadRef" v-model:file-list="importFormData.files" class="w-full"
-              ref="uploadRef"
-              v-model:file-list="importFormData.files"
-              class="w-full"
               accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-              :drag="true"
+              :drag="true" :limit="1" :auto-upload="false" :on-exceed="handleFileExceed">
-              :limit="1"
-              :auto-upload="false"
-              :on-exceed="handleFileExceed"
-            >
               <el-icon class="el-icon--upload"><upload-filled /></el-icon>
               <div class="el-upload__text">
                 <span>将文件拖到此处，或</span>
@@ -422,13 +296,8 @@
               <template #tip>
                 <div class="el-upload__tip">
                   *.xlsx / *.xls
-                  <el-link
+                  <el-link v-if="contentConfig.importTemplate" type="primary" icon="download" :underline="false"
-                    v-if="contentConfig.importTemplate"
+                    @click="handleDownloadTemplate">
-                    type="primary"
-                    icon="download"
-                    :underline="false"
-                    @click="handleDownloadTemplate"
-                  >
                     下载模板
                   </el-link>
                 </div>
@@ -440,11 +309,7 @@
       <!-- 弹窗底部操作按钮 -->
       <template #footer>
         <div style="padding-right: var(--el-dialog-padding-primary)">
-          <el-button
+          <el-button type="primary" :disabled="importFormData.files.length === 0" @click="handleImportSubmit">
-            type="primary"
-            :disabled="importFormData.files.length === 0"
-            @click="handleImportSubmit"
-          >
             确 定
           </el-button>
           <el-button @click="handleCloseImportModal">取 消</el-button>
@@ -915,10 +780,10 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
     .indexAction(
       showPagination
         ? {
-            [request.pageName]: pagination.currentPage,
+          [request.pageName]: pagination.currentPage,
-            [request.limitName]: pagination.pageSize,
+          [request.limitName]: pagination.pageSize,
-            ...formData,
+          ...formData,
-          }
+        }
         : formData
     )
     .then((data) => {

src/views/product/categoryconfig/add.ts

@@ -1,4 +1,4 @@
-import UserAPI from "@/api/product/commonUnits";
+import UserAPI from "@/api/product/productclassification";
 
 import type { IModalConfig } from "@/components/CURD/types";
 
@@ -32,7 +32,7 @@ const modalConfig: IModalConfig<UserForm> = {
       type: "UpImage",
     },
     {
-      label: "开关2",
+      label: "开关",
       prop: "status",
       type: "switch",
       options: [
@@ -47,6 +47,6 @@ const modalConfig: IModalConfig<UserForm> = {
     },
   ],
 };
-export interface UserForm {}
+export interface UserForm { }
 // 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
 export default reactive(modalConfig);

src/views/product/categoryconfig/content.ts

@@ -28,17 +28,17 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   modifyAction: UserAPI.update,
 
   // importTemplate: UserAPI.downloadTemplate,
-  importsAction(data) {
+  // importsAction(data) {
-    // 模拟导入数据
+  //   // 模拟导入数据
-    console.log("importsAction", data);
+  //   console.log("importsAction", data);
-    return Promise.resolve();
+  //   return Promise.resolve();
-  },
+  // },
-  exportsAction: async function (params) {
+  // exportsAction: async function (params) {
-    // 模拟获取到的是全量数据
+  //   // 模拟获取到的是全量数据
-    const res = await UserAPI.getPage(params);
+  //   const res = await UserAPI.getPage(params);
-    console.log("exportsAction", res.list);
+  //   console.log("exportsAction", res.list);
-    return res.list;
+  //   return res.list;
-  },
+  // },
   pk: "id",
   toolbar: [
     "add",

src/views/product/categoryconfig/edit.ts

@@ -15,7 +15,7 @@ const modalConfig: IModalConfig<UserForm> = {
 
   pk: "id",
   formAction: function (data) {
-    return UserAPI.update(data);
+    return UserAPI.update({ ...data, sort: '1' });
   },
   beforeSubmit(data) {
     console.log("提交之前处理", data);