Pre Merge pull request !388 from dhb52/hotfix/dhb52/prettier

src/api/bpm/processInstance/index.ts

@@ -21,13 +21,13 @@ export type ProcessInstanceVO = {
 }
 
 export type ProcessInstanceCCVO = {
-  type: number,
+  type: number
-  taskName: string,
+  taskName: string
-  taskKey: string,
+  taskKey: string
-  processInstanceName: string,
+  processInstanceName: string
-  processInstanceKey: string,
+  processInstanceKey: string
-  startUserId: string,
+  startUserId: string
-  options:string [],
+  options: string[]
   reason: string
 }
 
@@ -62,9 +62,9 @@ export const createProcessInstanceCC = async (data) => {
 
 /**
  * 抄送列表
- * @param params 
+ * @param params
- * @returns 
+ * @returns
  */
 export const getProcessInstanceCCPage = async (params) => {
   return await request.get({ url: '/bpm/process-instance/cc/my-page', params })
-}
+}

src/components/Descriptions/src/Descriptions.vue

@@ -130,9 +130,7 @@ const toggleClick = () => {
                 <DictTag :type="item.dictType" :value="data[item.field] + ''" />
               </slot>
               <slot v-else :name="item.field" :row="data">
-                {{
+                {{ item.mappedField ? data[item.mappedField] : data[item.field] }}
-                    item.mappedField ? data[item.mappedField] : data[item.field]
-                }}
               </slot>
             </template>
           </ElDescriptionsItem>

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;
-  background: var(--el-color-primary-light-7);
+  z-index: 10;
-  opacity: 0.8;
-  border: 1px solid var(--el-color-primary);
-  color: var(--el-color-primary);
-  font-size: 16px;
   display: flex;
+  font-size: 16px;
+  color: var(--el-color-primary);
+  cursor: move;
+  background: var(--el-color-primary-light-7);
+  border: 1px solid var(--el-color-primary);
+  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;
-  background: var(--el-color-primary-light-7);
+  z-index: 10;
-  opacity: 0.8;
-  border: 1px solid var(--el-color-primary);
-  color: var(--el-color-primary);
-  font-size: 14px;
   display: flex;
+  font-size: 14px;
+  color: var(--el-color-primary);
+  cursor: move;
+  background: var(--el-color-primary-light-7);
+  border: 1px solid var(--el-color-primary);
+  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/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;
+    color: var(--el-color-primary);
+    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;
-    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;
 
     .btn-delete {
-      z-index: 1;
       position: absolute;
       top: -8px;
       right: -8px;
-      height: 16px;
+      z-index: 1;
-      width: 16px;
       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/layout/components/UserInfo/src/UserInfo.vue

@@ -33,8 +33,7 @@ const loginOut = async () => {
     await userStore.loginOut()
     tagsViewStore.delAllViews()
     replace('/login?redirect=/index')
-  }
+  } catch {}
-  catch { }
 }
 const toProfile = async () => {
   push('/user/profile')

src/views/Profile/components/BasicInfo.vue

@@ -27,7 +27,7 @@ defineOptions({ name: 'BasicInfo' })
 
 const { t } = useI18n()
 const message = useMessage() // 消息弹窗
-const userStore = useUserStore() 
+const userStore = useUserStore()
 // 表单校验
 const rules = reactive<FormRules>({
   nickname: [{ required: true, message: t('profile.rules.nickname'), trigger: 'blur' }],

src/views/Profile/components/UserAvatar.vue

@@ -16,7 +16,6 @@ import { uploadAvatar } from '@/api/system/user/profile'
 import { CropperAvatar } from '@/components/Cropper'
 import { useUserStore } from '@/store/modules/user'
 
-
 defineOptions({ name: 'UserAvatar' })
 
 defineProps({
@@ -25,7 +24,6 @@ defineProps({
 
 const userStore = useUserStore()
 
-
 const cropperRef = ref()
 const handelUpload = async ({ data }) => {
   const res = await uploadAvatar({ avatarFile: data })

src/views/bpm/task/todo/index.vue

@@ -75,7 +75,7 @@
       :total="total"
       @pagination="getList"
     />
-    <TaskCCDialogForm  ref="taskCCDialogForm"/>
+    <TaskCCDialogForm ref="taskCCDialogForm" />
   </ContentWrap>
 </template>
 

src/views/crm/clue/ClueForm.vue

@@ -30,10 +30,10 @@
       <el-form-item v-if="formType === 'create'" label="负责人" prop="userIds" span="24">
         <el-select v-model="formData.ownerUserId">
           <el-option
-              v-for="item in userOptions"
+            v-for="item in userOptions"
-              :key="item.id"
+            :key="item.id"
-              :label="item.nickname"
+            :label="item.nickname"
-              :value="item.id"
+            :value="item.id"
           />
         </el-select>
       </el-form-item>
@@ -49,8 +49,8 @@
 </template>
 <script setup lang="ts">
 import * as ClueApi from '@/api/crm/clue'
-import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import * as UserApi from "@/api/system/user";
+import * as UserApi from '@/api/system/user'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

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/report/ureport/UReportDataForm.vue

@@ -49,11 +49,11 @@ const formData = ref({
   name: undefined,
   status: undefined,
   content: undefined,
-  remark: undefined,
+  remark: undefined
 })
 const formRules = reactive({
   name: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -106,8 +106,8 @@ const resetForm = () => {
     name: undefined,
     status: undefined,
     content: undefined,
-    remark: undefined,
+    remark: undefined
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>

src/views/report/ureport/index2.vue

@@ -18,12 +18,7 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
-          v-model="queryParams.status"
-          placeholder="请选择状态"
-          clearable
-          class="!w-240px"
-        >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
@@ -150,7 +145,7 @@ const queryParams = reactive({
   name: null,
   status: null,
   remark: null,
-  createTime: [],
+  createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中