style: eslint

src/api/menduner/system/area/index.ts

@@ -0,0 +1,42 @@
+import request from '@/config/axios'
+
+// 地区 VO
+export interface AreaVO {
+  id: number // id
+  name: string // 区域名称
+  type: number // 区域类型
+  parentId: number // 上级区域
+}
+
+// 地区 API
+export const AreaApi = {
+  // 查询地区列表
+  getAreaList: async (params) => {
+    return await request.get({ url: `/menduner.system/area/list`, params })
+  },
+
+  // 查询地区详情
+  getArea: async (id: number) => {
+    return await request.get({ url: `/menduner.system/area/get?id=` + id })
+  },
+
+  // 新增地区
+  createArea: async (data: AreaVO) => {
+    return await request.post({ url: `/menduner.system/area/create`, data })
+  },
+
+  // 修改地区
+  updateArea: async (data: AreaVO) => {
+    return await request.put({ url: `/menduner.system/area/update`, data })
+  },
+
+  // 删除地区
+  deleteArea: async (id: number) => {
+    return await request.delete({ url: `/menduner.system/area/delete?id=` + id })
+  },
+
+  // 导出地区 Excel
+  exportArea: async (params) => {
+    return await request.download({ url: `/menduner.system/area/export-excel`, params })
+  }
+}

src/components/DiyEditor/components/mobile/FloatingActionButton/index.vue

@@ -55,12 +55,12 @@ const handleToggleFab = () => {
 /* 模态背景 */
 .modal-bg {
   position: absolute;
-  left: calc(50% - 375px / 2);
   top: 0;
+  left: calc(50% - 375px / 2);
   z-index: 11;
   width: 375px;
   height: 100%;
-  background-color: rgba(#000000, 0.4);
+  background-color: rgba(#000, 0.4);
 }
 
 .fab-icon {

src/components/DiyEditor/components/mobile/HotZone/components/HotZoneEditDialog/index.vue

@@ -192,39 +192,39 @@ const handleAppLinkChange = (appLink: AppLink) => {
 <style scoped lang="scss">
 .hot-zone {
   position: absolute;
+  z-index: 10;
+  display: flex;
+  font-size: 16px;
+  color: var(--el-color-primary);
+  cursor: move;
   background: var(--el-color-primary-light-7);
-  opacity: 0.8;
   border: 1px solid var(--el-color-primary);
-  color: var(--el-color-primary);
-  font-size: 16px;
-  display: flex;
+  opacity: 0.8;
   align-items: center;
   justify-content: center;
-  cursor: move;
-  z-index: 10;
 
   /* 控制点 */
   .ctrl-dot {
     position: absolute;
+    z-index: 11;
     width: 8px;
     height: 8px;
-    border-radius: 50%;
-    border: inherit;
     background-color: #fff;
-    z-index: 11;
+    border: inherit;
+    border-radius: 50%;
   }
 
   .delete {
-    display: none;
     position: absolute;
     top: 0;
     right: 0;
+    display: none;
     padding: 2px 2px 6px 6px;
-    background-color: var(--el-color-primary);
-    border-radius: 0 0 0 80%;
-    cursor: pointer;
     color: #fff;
     text-align: right;
+    cursor: pointer;
+    background-color: var(--el-color-primary);
+    border-radius: 0 0 0 80%;
   }
 
   &:hover {

src/components/DiyEditor/components/mobile/HotZone/index.vue

@@ -28,15 +28,15 @@ const props = defineProps<{ property: HotZoneProperty }>()
 <style scoped lang="scss">
 .hot-zone {
   position: absolute;
+  z-index: 10;
+  display: flex;
+  font-size: 14px;
+  color: var(--el-color-primary);
+  cursor: move;
   background: var(--el-color-primary-light-7);
-  opacity: 0.8;
   border: 1px solid var(--el-color-primary);
-  color: var(--el-color-primary);
-  font-size: 14px;
-  display: flex;
+  opacity: 0.8;
   align-items: center;
   justify-content: center;
-  cursor: move;
-  z-index: 10;
 }
 </style>

src/components/DiyEditor/components/mobile/HotZone/property.vue

@@ -42,22 +42,22 @@ const handleOpenEditDialog = () => {
 <style scoped lang="scss">
 .hot-zone {
   position: absolute;
+  display: flex;
+  font-size: 12px;
+  color: #fff;
+  cursor: move;
   background: #409effbf;
   border: 1px solid var(--el-color-primary);
-  color: #fff;
-  font-size: 12px;
-  display: flex;
   align-items: center;
   justify-content: center;
-  cursor: move;
 
   /* 控制点 */
   .ctrl-dot {
     position: absolute;
     width: 4px;
     height: 4px;
-    border-radius: 50%;
     background-color: #fff;
+    border-radius: 50%;
   }
 }
 </style>

src/components/DiyEditor/components/mobile/MenuSwiper/index.vue

@@ -103,13 +103,16 @@ watch(
   .el-carousel__indicator {
     padding-top: 0;
     padding-bottom: 0;
+
     .el-carousel__button {
       --el-carousel-indicator-height: 6px;
       --el-carousel-indicator-width: 6px;
       --el-carousel-indicator-out-color: #ff6000;
+
       border-radius: 6px;
     }
   }
+
   .el-carousel__indicator.is-active {
     .el-carousel__button {
       --el-carousel-indicator-width: 12px;

src/components/DiyEditor/components/mobile/NavigationBar/index.vue

@@ -64,10 +64,10 @@ const getSearchProp = (cell: NavigationBarCellProperty) => {
 .navigation-bar {
   display: flex;
   height: 50px;
+  padding: 0 6px;
   background: #fff;
   justify-content: space-between;
   align-items: center;
-  padding: 0 6px;
 
   /* 左边 */
   .left {

src/components/DiyEditor/index.vue

@@ -545,11 +545,12 @@ $toolbar-height: 42px;
         gap: 8px;
 
         :deep(.el-tag) {
-          box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.1);
           border: none;
+          box-shadow: 0 2px 8px 0 rgb(0 0 0 / 10%);
+
           .el-tag__content {
-            width: 100%;
             display: flex;
+            width: 100%;
             align-items: center;
             justify-content: flex-start;
 

src/components/InputWithColor/index.vue

@@ -50,6 +50,7 @@ watch(
 <style scoped lang="scss">
 :deep(.el-input-group__append) {
   padding: 0;
+
   .el-color-picker__trigger {
     padding: 0;
     border-left: none;

src/components/MagicCubeEditor/index.vue

@@ -225,15 +225,16 @@ const eachCube = (callback: (x: number, y: number, cube: Cube) => void) => {
 <style lang="scss" scoped>
 .cube-table {
   position: relative;
-  border-spacing: 0;
   border-collapse: collapse;
+  border-spacing: 0;
 
   .cube {
-    border: 1px solid var(--el-border-color);
-    text-align: center;
     color: var(--el-text-color-secondary);
+    text-align: center;
     cursor: pointer;
+    border: 1px solid var(--el-border-color);
     box-sizing: border-box;
+
     &.active {
       background: var(--el-color-primary-light-9);
     }
@@ -242,28 +243,28 @@ const eachCube = (callback: (x: number, y: number, cube: Cube) => void) => {
   .hot-area {
     position: absolute;
     display: flex;
-    align-items: center;
-    justify-content: center;
-    border: 1px solid var(--el-color-primary);
-    background: var(--el-color-primary-light-8);
     color: var(--el-color-primary);
-    box-sizing: border-box;
-    border-spacing: 0;
-    border-collapse: collapse;
     cursor: pointer;
+    background: var(--el-color-primary-light-8);
+    border: 1px solid var(--el-color-primary);
+    border-collapse: collapse;
+    border-spacing: 0;
+    box-sizing: border-box;
+    align-items: center;
+    justify-content: center;
 
     .btn-delete {
-      z-index: 1;
       position: absolute;
       top: -8px;
       right: -8px;
-      height: 16px;
-      width: 16px;
+      z-index: 1;
       display: flex;
+      width: 16px;
+      height: 16px;
+      background-color: #fff;
+      border-radius: 50%;
       align-items: center;
       justify-content: center;
-      border-radius: 50%;
-      background-color: #fff;
     }
   }
 }

src/components/SimpleProcessDesigner/src/addNode.vue

@@ -101,66 +101,63 @@ const addType = (type) => {
 </script>
 <style scoped lang="scss">
 .add-node-btn-box {
-  width: 240px;
+  position: relative;
   display: inline-flex;
+  width: 240px;
+  -webkit-box-flex: 1;
   -ms-flex-negative: 0;
   flex-shrink: 0;
-  -webkit-box-flex: 1;
   -ms-flex-positive: 1;
-  position: relative;
 
-  &:before {
-    content: '';
+  &::before {
     position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+    inset: 0;
     z-index: -1;
-    margin: auto;
     width: 2px;
     height: 100%;
+    margin: auto;
     background-color: #cacaca;
+    content: '';
   }
 
   .add-node-btn {
-    user-select: none;
+    display: flex;
     width: 240px;
     padding: 20px 0 32px;
-    display: flex;
+    -webkit-box-flex: 1;
     -webkit-box-pack: center;
+    user-select: none;
     justify-content: center;
     flex-shrink: 0;
-    -webkit-box-flex: 1;
     flex-grow: 1;
 
     .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
+      position: relative;
       width: 30px;
       height: 30px;
+      line-height: 30px;
       background: #3296fa;
-      border-radius: 50%;
-      position: relative;
       border: none;
-      line-height: 30px;
-      -webkit-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+      border-radius: 50%;
+      outline: none;
+      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
+      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
       transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 
       .iconfont {
-        color: #fff;
         font-size: 16px;
+        color: #fff;
       }
 
       &:hover {
         transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgba(0, 0, 0, 0.1);
+        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
       }
 
       &:active {
-        transform: none;
         background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
+        transform: none;
+        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
       }
     }
   }
@@ -171,13 +168,12 @@ const addType = (type) => {
 
   .add-node-popover-item {
     margin-right: 10px;
-    cursor: pointer;
+    color: #191f25 !important;
     text-align: center;
+    cursor: pointer;
     flex: 1;
-    color: #191f25 !important;
 
     .item-wrapper {
-      user-select: none;
       display: inline-block;
       width: 80px;
       height: 80px;
@@ -186,6 +182,7 @@ const addType = (type) => {
       border: 1px solid #e2e2e2;
       border-radius: 50%;
       transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+      user-select: none;
 
       .iconfont {
         font-size: 35px;
@@ -214,7 +211,7 @@ const addType = (type) => {
     &:hover {
       .item-wrapper {
         background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgba(50, 150, 250, 0.4);
+        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
       }
 
       .iconfont {
@@ -224,8 +221,8 @@ const addType = (type) => {
 
     &:active {
       .item-wrapper {
-        box-shadow: none;
         background: #eaeaea;
+        box-shadow: none;
       }
 
       .iconfont {

src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

@@ -536,7 +536,7 @@ watch(
 
 .highlight-reject.djs-connection > .djs-visual > path {
   stroke: red !important;
-  marker-end: url(#sequenceflow-end-white-success) !important;
+  marker-end: url("#sequenceflow-end-white-success") !important;
 }
 
 .highlight-reject:not(.djs-connection) .djs-visual > :nth-child(1) {

src/layout/components/UserInfo/src/components/LockDialog.vue

@@ -91,7 +91,7 @@ const handleLock = async () => {
 
 <style lang="scss" scoped>
 :global(.v-lock-dialog) {
-  @media (max-width: 767px) {
+  @media (width <= 767px) {
     max-width: calc(100vw - 16px);
   }
 }

src/layout/components/UserInfo/src/components/LockPage.vue

@@ -205,6 +205,7 @@ $error-color: #ed6f6f;
         font-size: 90px;
       }
     }
+
     @media screen and (min-width: $screen-lg) {
       span:not(.meridiem) {
         font-size: 220px;
@@ -216,6 +217,7 @@ $error-color: #ed6f6f;
         font-size: 260px;
       }
     }
+
     @media screen and (min-width: $screen-2xl) {
       span:not(.meridiem) {
         font-size: 320px;
@@ -230,7 +232,7 @@ $error-color: #ed6f6f;
     display: flex;
     width: 100%;
     height: 100%;
-    background-color: rgba(0, 0, 0, 0.5);
+    background-color: rgb(0 0 0 / 50%);
     backdrop-filter: blur(8px);
     justify-content: center;
     align-items: center;

src/views/mall/promotion/rewardActivity/RewardForm.vue

@@ -33,7 +33,7 @@
       <el-form-item label="优惠设置">
         <template v-for="(item, index) in formData.rules" :key="index">
           <el-row type="flex">
-            <el-col :span="24" style="font-weight: bold; display: flex">
+            <el-col :span="24" style=" display: flex;font-weight: bold">
               活动层级{{ index + 1 }}
               <el-button
                 link

src/views/menduner/system/area/AreaForm.vue

@@ -0,0 +1,121 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="区域名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入区域名称" />
+      </el-form-item>
+      <el-form-item label="区域类型" prop="type">
+        <el-select v-model="formData.type" placeholder="请选择区域类型">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上级区域" prop="parentId">
+        <el-tree-select
+          v-model="formData.parentId"
+          :data="areaTree"
+          :props="defaultProps"
+          check-strictly
+          default-expand-all
+          placeholder="请选择上级区域"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { AreaApi, AreaVO } from '@/api/menduner/system/area'
+import { defaultProps, handleTree } from '@/utils/tree'
+
+/** 地区 表单 */
+defineOptions({ name: 'AreaForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  type: undefined,
+  parentId: undefined
+})
+const formRules = reactive({})
+const formRef = ref() // 表单 Ref
+const areaTree = ref() // 树形结构
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await AreaApi.getArea(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  await getAreaTree()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as AreaVO
+    if (formType.value === 'create') {
+      await AreaApi.createArea(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await AreaApi.updateArea(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    type: undefined,
+    parentId: undefined
+  }
+  formRef.value?.resetFields()
+}
+
+/** 获得地区树 */
+const getAreaTree = async () => {
+  areaTree.value = []
+  const data = await AreaApi.getAreaList()
+  const root: Tree = { id: 0, name: '顶级地区', children: [] }
+  root.children = handleTree(data, 'id', 'parentId')
+  areaTree.value.push(root)
+}
+</script>

src/views/menduner/system/area/index.vue

@@ -0,0 +1,228 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="区域名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入区域名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="区域类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择区域类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上级区域" prop="parentId">
+        <el-input
+          v-model="queryParams.parentId"
+          placeholder="请输入上级区域"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['menduner:system:area:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['menduner:system:area:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+        <el-button type="danger" plain @click="toggleExpandAll">
+          <Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      row-key="id"
+      :default-expand-all="isExpandAll"
+      v-if="refreshTable"
+    >
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="区域名称" align="center" prop="name" />
+      <el-table-column label="区域类型" align="center" prop="type" />
+      <el-table-column label="上级区域" align="center" prop="parentId" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['menduner:system:area:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['menduner:system:area:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <AreaForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import { handleTree } from '@/utils/tree'
+import download from '@/utils/download'
+import { AreaApi, AreaVO } from '@/api/menduner/system/area'
+import AreaForm from './AreaForm.vue'
+
+/** 地区 列表 */
+defineOptions({ name: 'Area' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<AreaVO[]>([]) // 列表的数据
+const queryParams = reactive({
+  name: undefined,
+  type: undefined,
+  parentId: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await AreaApi.getAreaList(queryParams)
+    list.value = handleTree(data, 'id', 'parentId')
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await AreaApi.deleteArea(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await AreaApi.exportArea(queryParams)
+    download.excel(data, '地区.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 展开/折叠操作 */
+const isExpandAll = ref(true) // 是否展开，默认全部展开
+const refreshTable = ref(true) // 重新渲染表格状态
+const toggleExpandAll = async () => {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  await nextTick()
+  refreshTable.value = true
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/system/area/AreaForm.vue

@@ -69,5 +69,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-
 </script>