chore: 修改类别管理拖拽

76177b2a · 王鹏飞 · 7f55cfea · 76177b2a · 76177b2a · 76177b2a
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
+{
+  "globals": {
+    "$": true,
+    "$$": true,
+    "$computed": true,
+    "$customRef": true,
+    "$ref": true,
+    "$shallowRef": true,
+    "$toRef": true,
+    "EffectScope": true,
+    "asyncComputed": true,
+    "autoResetRef": true,
+    "computed": true,
+    "computedAsync": true,
+    "computedEager": true,
+    "computedInject": true,
+    "computedWithControl": true,
+    "controlledComputed": true,
+    "controlledRef": true,
+    "createApp": true,
+    "createEventHook": true,
+    "createGlobalState": true,
+    "createInjectionState": true,
+    "createReactiveFn": true,
+    "createSharedComposable": true,
+    "createUnrefFn": true,
+    "customRef": true,
+    "debouncedRef": true,
+    "debouncedWatch": true,
+    "defineAsyncComponent": true,
+    "defineComponent": true,
+    "eagerComputed": true,
+    "effectScope": true,
+    "extendRef": true,
+    "getCurrentInstance": true,
+    "getCurrentScope": true,
+    "h": true,
+    "ignorableWatch": true,
+    "inject": true,
+    "isDefined": true,
+    "isProxy": true,
+    "isReactive": true,
+    "isReadonly": true,
+    "isRef": true,
+    "logicAnd": true,
+    "logicNot": true,
+    "logicOr": true,
+    "makeDestructurable": true,
+    "markRaw": true,
+    "nextTick": true,
+    "onActivated": true,
+    "onBeforeMount": true,
+    "onBeforeUnmount": true,
+    "onBeforeUpdate": true,
+    "onClickOutside": true,
+    "onDeactivated": true,
+    "onErrorCaptured": true,
+    "onKeyStroke": true,
+    "onLongPress": true,
+    "onMounted": true,
+    "onRenderTracked": true,
+    "onRenderTriggered": true,
+    "onScopeDispose": true,
+    "onServerPrefetch": true,
+    "onStartTyping": true,
+    "onUnmounted": true,
+    "onUpdated": true,
+    "pausableWatch": true,
+    "provide": true,
+    "reactify": true,
+    "reactifyObject": true,
+    "reactive": true,
+    "reactiveComputed": true,
+    "reactiveOmit": true,
+    "reactivePick": true,
+    "readonly": true,
+    "ref": true,
+    "refAutoReset": true,
+    "refDebounced": true,
+    "refDefault": true,
+    "refThrottled": true,
+    "refWithControl": true,
+    "resolveComponent": true,
+    "shallowReactive": true,
+    "shallowReadonly": true,
+    "shallowRef": true,
+    "syncRef": true,
+    "syncRefs": true,
+    "templateRef": true,
+    "throttledRef": true,
+    "throttledWatch": true,
+    "toRaw": true,
+    "toReactive": true,
+    "toRef": true,
+    "toRefs": true,
+    "triggerRef": true,
+    "tryOnBeforeMount": true,
+    "tryOnBeforeUnmount": true,
+    "tryOnMounted": true,
+    "tryOnScopeDispose": true,
+    "tryOnUnmounted": true,
+    "unref": true,
+    "unrefElement": true,
+    "until": true,
+    "useActiveElement": true,
+    "useAsyncQueue": true,
+    "useAsyncState": true,
+    "useAttrs": true,
+    "useBase64": true,
+    "useBattery": true,
+    "useBreakpoints": true,
+    "useBroadcastChannel": true,
+    "useBrowserLocation": true,
+    "useCached": true,
+    "useClamp": true,
+    "useClipboard": true,
+    "useColorMode": true,
+    "useConfirmDialog": true,
+    "useCounter": true,
+    "useCssModule": true,
+    "useCssVar": true,
+    "useCssVars": true,
+    "useCurrentElement": true,
+    "useCycleList": true,
+    "useDark": true,
+    "useDateFormat": true,
+    "useDebounce": true,
+    "useDebounceFn": true,
+    "useDebouncedRefHistory": true,
+    "useDeviceMotion": true,
+    "useDeviceOrientation": true,
+    "useDevicePixelRatio": true,
+    "useDevicesList": true,
+    "useDisplayMedia": true,
+    "useDocumentVisibility": true,
+    "useDraggable": true,
+    "useDropZone": true,
+    "useElementBounding": true,
+    "useElementByPoint": true,
+    "useElementHover": true,
+    "useElementSize": true,
+    "useElementVisibility": true,
+    "useEventBus": true,
+    "useEventListener": true,
+    "useEventSource": true,
+    "useEyeDropper": true,
+    "useFavicon": true,
+    "useFetch": true,
+    "useFileSystemAccess": true,
+    "useFocus": true,
+    "useFocusWithin": true,
+    "useFps": true,
+    "useFullscreen": true,
+    "useGamepad": true,
+    "useGeolocation": true,
+    "useIdle": true,
+    "useInfiniteScroll": true,
+    "useIntersectionObserver": true,
+    "useInterval": true,
+    "useIntervalFn": true,
+    "useKeyModifier": true,
+    "useLastChanged": true,
+    "useLocalStorage": true,
+    "useMagicKeys": true,
+    "useManualRefHistory": true,
+    "useMediaControls": true,
+    "useMediaQuery": true,
+    "useMemoize": true,
+    "useMemory": true,
+    "useMounted": true,
+    "useMouse": true,
+    "useMouseInElement": true,
+    "useMousePressed": true,
+    "useMutationObserver": true,
+    "useNavigatorLanguage": true,
+    "useNetwork": true,
+    "useNow": true,
+    "useOffsetPagination": true,
+    "useOnline": true,
+    "usePageLeave": true,
+    "useParallax": true,
+    "usePermission": true,
+    "usePointer": true,
+    "usePointerSwipe": true,
+    "usePreferredColorScheme": true,
+    "usePreferredDark": true,
+    "usePreferredLanguages": true,
+    "useRafFn": true,
+    "useRefHistory": true,
+    "useResizeObserver": true,
+    "useRoute": true,
+    "useRouter": true,
+    "useScreenOrientation": true,
+    "useScreenSafeArea": true,
+    "useScriptTag": true,
+    "useScroll": true,
+    "useScrollLock": true,
+    "useSessionStorage": true,
+    "useShare": true,
+    "useSlots": true,
+    "useSpeechRecognition": true,
+    "useSpeechSynthesis": true,
+    "useStorage": true,
+    "useStorageAsync": true,
+    "useStyleTag": true,
+    "useSwipe": true,
+    "useTemplateRefsList": true,
+    "useTextSelection": true,
+    "useThrottle": true,
+    "useThrottleFn": true,
+    "useThrottledRefHistory": true,
+    "useTimeAgo": true,
+    "useTimeout": true,
+    "useTimeoutFn": true,
+    "useTimeoutPoll": true,
+    "useTimestamp": true,
+    "useTitle": true,
+    "useToggle": true,
+    "useTransition": true,
+    "useUrlSearchParams": true,
+    "useUserMedia": true,
+    "useVModel": true,
+    "useVModels": true,
+    "useVibrate": true,
+    "useVirtualList": true,
+    "useWakeLock": true,
+    "useWebNotification": true,
+    "useWebSocket": true,
+    "useWebWorker": true,
+    "useWebWorkerFn": true,
+    "useWindowFocus": true,
+    "useWindowScroll": true,
+    "useWindowSize": true,
+    "watch": true,
+    "watchAtMost": true,
+    "watchDebounced": true,
+    "watchEffect": true,
+    "watchIgnorable": true,
+    "watchOnce": true,
+    "watchPausable": true,
+    "watchPostEffect": true,
+    "watchSyncEffect": true,
+    "watchThrottled": true,
+    "watchWithFilter": true,
+    "whenever": true
+  }
+}
\ No newline at end of file
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -13,17 +13,17 @@
    "deploy": "node ./deploy.js"
  },
  "dependencies": {
-    "@element-plus/icons-vue": "^1.1.4",
+    "@element-plus/icons-vue": "^2.0.4",
    "@tinymce/tinymce-vue": "^5.0.0",
    "axios": "^0.27.2",
    "blueimp-md5": "^2.19.0",
-    "drag-drop-tree-table": "^1.1.1",
    "echarts": "^5.3.2",
-    "element-plus": "^2.2.2",
+    "element-plus": "^2.2.5",
    "pinia": "^2.0.14",
-    "qs": "^6.10.3",
-    "vue": "^3.2.36",
-    "vue-router": "^4.0.15"
+    "qs": "^6.10.5",
+    "sortablejs": "^1.15.0",
+    "vue": "^3.2.37",
+    "vue-router": "^4.0.16"
  },
  "devDependencies": {
    "@rushstack/eslint-patch": "^1.1.3",
@@ -36,11 +36,9 @@
    "@vue/tsconfig": "^0.1.3",
    "ali-oss": "^6.17.1",
    "chalk": "^5.0.1",
-    "drag-tree-table": "^2.2.0",
    "eslint": "^8.16.0",
    "eslint-plugin-vue": "^8.7.1",
    "sass": "^1.52.1",
-    "sortablejs": "^1.15.0",
    "typescript": "~4.7.2",
    "unplugin-auto-import": "^0.8.7",
    "vite": "^2.9.9",

--- a/src/components/base/AppList.vue
+++ b/src/components/base/AppList.vue
@@ -33,7 +33,7 @@ const tableRef = ref()
 const dataList = ref<any[]>([])
 const page = reactive({ total: 0, size: props.limit, currentPage: 1 })

-const params = reactive({ page: page.currentPage, ['per-page']: page.size, ...props.remote?.params })
+const params = reactive({ ...props.remote?.params })
 watch(
  () => props.data,
  list => {
@@ -133,27 +133,10 @@ defineExpose({ refetch })
              </template>
              <template v-else>
                <!-- input -->
-                <el-input
-                  v-model="params[item.prop]"
-                  v-bind="item"
-                  clearable
-                  @change="search"
-                  v-if="item.type === 'input'"
-                />
+                <el-input v-model="params[item.prop]" v-bind="item" clearable @change="search" v-if="item.type === 'input'" />
                <!-- select -->
-                <el-select
-                  v-model="params[item.prop]"
-                  v-bind="item"
-                  clearable
-                  @change="search"
-                  v-if="item.type === 'select'"
-                >
-                  <el-option
-                    :label="option[item.labelKey] || option.label"
-                    :value="option[item.valueKey] || option.value"
-                    v-for="(option, index) in item.options"
-                    :key="index"
-                  />
+                <el-select v-model="params[item.prop]" v-bind="item" clearable @change="search" v-if="item.type === 'select'">
+                  <el-option :label="option[item.labelKey] || option.label" :value="option[item.valueKey] || option.value" v-for="(option, index) in item.options" :key="index" />
                </el-select>
              </template>
            </el-form-item>
@@ -204,12 +187,12 @@ defineExpose({ refetch })
 </template>

 <style lang="scss">
-.table-list {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  box-sizing: border-box;
-}
+// .table-list {
+//   height: 100%;
+//   display: flex;
+//   flex-direction: column;
+//   box-sizing: border-box;
+// }
 .table-list-hd {
  display: flex;
  margin-bottom: 10px;
@@ -217,9 +200,9 @@ defineExpose({ refetch })
 .table-list-filter {
  flex: 1;
 }
-.table-list-bd {
-  flex: 1;
-}
+// .table-list-bd {
+//   flex: 1;
+// }
 .table-list-ft {
  padding: 10px 0;
  display: flex;

--- a/src/modules/admin/category/api.ts
+++ b/src/modules/admin/category/api.ts
@@ -30,6 +30,6 @@ export function delCategory(data: { id: string }) {
  return httpRequest.post('/api/resource/v1/backend/category/delete', data)
 }
 // 移动分类
-export function moveCategory(data: { id: string; brother_id: string; type: string }) {
+export function moveCategory(data: { id: string; brother_id: string; type: 'before' | 'after' }) {
  return httpRequest.post('/api/resource/v1/backend/category/drag', data)
 }
--- a/src/modules/admin/category/views/List.vue
+++ b/src/modules/admin/category/views/List.vue