fix: fixed sort.service

gopowerteam · Jun 21, 2024 · 68d86d6 · 68d86d6
1 parent 4d5ae15
commit 68d86d6
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 32 deletions.
diff --git a/packages/form-render/CHANGELOG.md b/packages/form-render/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @gopowerteam/form-render
 
+## 0.0.66
+
+### Patch Changes
+
+- update version
+- Updated dependencies
+  - @gopowerteam/modal-render@0.0.42
+
 ## 0.0.65
 
 ### Patch Changes

diff --git a/packages/form-render/package.json b/packages/form-render/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/form-render",
   "type": "module",
-  "version": "0.0.65",
+  "version": "0.0.66",
   "author": {
     "name": "zhuchentong",
     "email": "2037630@gmail.com"
@@ -15,14 +15,11 @@
   "bugs": {
     "url": "https://github.com/gopowerteam/x-render/issues"
   },
-  "main": "./dist/cjs/index.cjs",
-  "module": "./dist/es/index.mjs",
-  "types": "./dist/es/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/es/index.d.ts",
-      "import": "./dist/es/index.mjs",
-      "require": "./dist/cjs/index.cjs"
+      "require": "./dist/cjs/index.cjs",
+      "import": "./dist/es/index.mjs"
     },
     "./es": {
       "types": "./dist/es/index.d.ts",
@@ -38,6 +35,9 @@
     },
     "./*": "./*"
   },
+  "main": "./dist/cjs/index.cjs",
+  "module": "./dist/es/index.mjs",
+  "types": "./dist/es/index.d.ts",
   "files": [
     "dist",
     "README.md"
@@ -48,14 +48,14 @@
     "npm:publish": "npm run build && npm publish --access publish"
   },
   "peerDependencies": {
-    "vue": "^3.0.0",
     "@arco-design/web-vue": "^2.52.1",
-    "@gopowerteam/modal-render": "^0.0.41"
+    "@gopowerteam/modal-render": "^0.0.42",
+    "vue": "^3.0.0"
   },
   "devDependencies": {
     "@arco-design/web-vue": "^2.55.1",
-    "@iconify-json/icon-park-outline": "^1.1.15",
     "@gopowerteam/modal-render": "workspace:*",
+    "@iconify-json/icon-park-outline": "^1.1.15",
     "@types/node": "18.16.0",
     "@unocss/preset-icons": "^0.59.4",
     "@unocss/preset-uno": "^0.59.4",

diff --git a/packages/modal-render/CHANGELOG.md b/packages/modal-render/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @gopowerteam/modal-render
 
+## 0.0.42
+
+### Patch Changes
+
+- update version
+
 ## 0.0.41
 
 ### Patch Changes

diff --git a/packages/modal-render/package.json b/packages/modal-render/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/modal-render",
   "type": "module",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "author": {
     "name": "zhuchentong",
     "email": "2037630@gmail.com"
@@ -15,14 +15,11 @@
   "bugs": {
     "url": "https://github.com/gopowerteam/x-render/issues"
   },
-  "main": "./dist/cjs/index.cjs",
-  "module": "./dist/es/index.mjs",
-  "types": "./dist/es/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/es/index.d.ts",
-      "import": "./dist/es/index.mjs",
-      "require": "./dist/cjs/index.cjs"
+      "require": "./dist/cjs/index.cjs",
+      "import": "./dist/es/index.mjs"
     },
     "./es": {
       "types": "./dist/es/index.d.ts",
@@ -38,6 +35,9 @@
     },
     "./*": "./*"
   },
+  "main": "./dist/cjs/index.cjs",
+  "module": "./dist/es/index.mjs",
+  "types": "./dist/es/index.d.ts",
   "files": [
     "dist",
     "README.md"

diff --git a/packages/table-render/CHANGELOG.md b/packages/table-render/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @gopowerteam/table-render
 
+## 0.0.116
+
+### Patch Changes
+
+- update version
+- Updated dependencies
+  - @gopowerteam/modal-render@0.0.42
+  - @gopowerteam/form-render@0.0.66
+
 ## 0.0.115
 
 ### Patch Changes

diff --git a/packages/table-render/package.json b/packages/table-render/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/table-render",
   "type": "module",
-  "version": "0.0.115",
+  "version": "0.0.116",
   "author": {
     "name": "zhuchentong",
     "email": "2037630@gmail.com"
@@ -15,14 +15,11 @@
   "bugs": {
     "url": "https://github.com/gopowerteam/x-render/issues"
   },
-  "main": "./dist/cjs/index.cjs",
-  "module": "./dist/es/index.mjs",
-  "types": "./dist/es/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/es/index.d.ts",
-      "import": "./dist/es/index.mjs",
-      "require": "./dist/cjs/index.cjs"
+      "require": "./dist/cjs/index.cjs",
+      "import": "./dist/es/index.mjs"
     },
     "./es": {
       "types": "./dist/es/index.d.ts",
@@ -37,12 +34,15 @@
       "import": "./dist/style.css"
     },
     "./resolver": {
+      "types": "./dist/es/resolver.d.ts",
       "require": "./dist/cjs/resolver.cjs",
-      "import": "./dist/es/resolver.mjs",
-      "types": "./dist/es/resolver.d.ts"
+      "import": "./dist/es/resolver.mjs"
     },
     "./*": "./*"
   },
+  "main": "./dist/cjs/index.cjs",
+  "module": "./dist/es/index.mjs",
+  "types": "./dist/es/index.d.ts",
   "files": [
     "dist",
     "README.md"
@@ -54,16 +54,17 @@
   },
   "peerDependencies": {
     "@arco-design/web-vue": "^2.52.1",
-    "@gopowerteam/form-render": "^0.0.65",
-    "@gopowerteam/modal-render": "^0.0.41",
+    "@gopowerteam/form-render": "^0.0.66",
+    "@gopowerteam/modal-render": "^0.0.42",
     "vue": "^3.0.0"
   },
+  "dependencies": {},
   "devDependencies": {
-    "@gopowerteam/request": "latest",
     "@arco-design/web-vue": "^2.55.1",
     "@arco-plugins/vite-vue": "^1.4.5",
     "@gopowerteam/form-render": "workspace:*",
     "@gopowerteam/modal-render": "workspace:*",
+    "@gopowerteam/request": "latest",
     "@iconify-json/icon-park-outline": "^1.1.15",
     "@types/node": "18.16.0",
     "@unocss/preset-icons": "^0.59.4",
@@ -72,18 +73,17 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/compiler-sfc": "3.4.23",
     "@vueuse/core": "^10.9.0",
+    "exceljs": "^4.4.0",
     "less": "^4.2.0",
     "typescript": "5.4.5",
     "unocss": "^0.59.4",
     "vite": "5.2.10",
     "vite-plugin-dts": "^3.8.3",
     "vue": "3.4.23",
-    "vue-tsc": "2.0.14",
-    "exceljs": "^4.4.0"
+    "vue-tsc": "2.0.14"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public"
-  },
-  "dependencies": {}
+  }
 }
diff --git a/packages/table-render/src/utils/sort.service.ts b/packages/table-render/src/utils/sort.service.ts
@@ -3,10 +3,12 @@ import type { SortableOptions } from '../interfaces'
 
 export class SortService implements RequestPlugin, SortableOptions {
   private sort: { [key: string]: 'asc' | 'desc' } = {}
+  private readonly defaultSort = {}
 
-  constructor(data?: Record<string, 'desc' | 'asc'>) {
+  constructor(data?: Record<string, 'asc' | 'desc'>) {
     if (data) {
       this.sort = data
+      this.defaultSort = data
     }
   }
 
@@ -51,7 +53,7 @@ export class SortService implements RequestPlugin, SortableOptions {
    * 重置分页数据
    */
   public reset() {
-    this.sort = {}
+    this.sort = this.defaultSort || {}
   }
 
   /**