holyes-table 1.0.15 → 1.0.17

package/README.md

@@ -4,22 +4,30 @@
 
 ## 目录
 
-- [优化](#优化)
-- [注意事项](#注意事项)
-- [组件依赖](#组件依赖)
-- [基本用法](#基本用法)
-  - [安装](#安装)
-  - [简单示例](#简单示例)
-- [Props 属性](#props-属性)
-  - [列配置说明 (columns)](#列配置说明-columns)
-  - [树形结构配置 (treeConfig)](#树形结构配置-treeconfig)
-  - [展开行配置 (expandConfig)](#展开行配置-expandconfig)
-- [Emits 事件](#emits-事件)
-- [Methods 方法](#methods-方法)
-  - [方法使用示例](#方法使用示例)
-- [插槽使用](#插槽使用)
-  - [自定义插槽](#自定义插槽)
-  - [默认插槽类型](#默认插槽类型)
+- [组件说明](#组件说明)
+  - [目录](#目录)
+  - [优化](#优化)
+  - [注意事项](#注意事项)
+  - [组件依赖](#组件依赖)
+  - [基本用法](#基本用法)
+    - [安装](#安装)
+    - [导入类型（TS 项目）](#导入类型ts-项目)
+    - [简单示例](#简单示例)
+  - [Props 属性](#props-属性)
+    - [列配置说明 (columns)](#列配置说明-columns)
+      - [筛选字段类型说明](#筛选字段类型说明)
+      - [列配置示例](#列配置示例)
+    - [树形结构配置 (treeConfig)](#树形结构配置-treeconfig)
+      - [树形结构配置示例](#树形结构配置示例)
+    - [展开行配置 (expandConfig)](#展开行配置-expandconfig)
+      - [展开行配置示例](#展开行配置示例)
+    - [表尾行属性配置 (footerProps)](#表尾行属性配置-footerprops)
+  - [Emits 事件](#emits-事件)
+  - [Methods 方法](#methods-方法)
+    - [方法使用示例](#方法使用示例)
+  - [插槽使用](#插槽使用)
+    - [自定义插槽](#自定义插槽)
+    - [默认插槽类型](#默认插槽类型)
 
 ## 优化
 
@@ -222,6 +230,8 @@ interface HolyesTableColumnPropsType {
   fixed?: "left" | "right" | ""
   /** 列是否可排序 */
   sortable?: boolean
+  /** 列排序实际的字段，默认值为列的field */
+  sortField?: string
   /** 列类型 */
   type?: "seq" | "checkbox" | "expand"
   /** 列样式 */
@@ -324,6 +334,8 @@ interface HolyesTableColumnPropsType {
       checkbox?: {
         /** 多选框是否半选，取决于row的哪个字段 */
         checkedIndeterminateField?: string
+        /** 多选框是否禁用，取决于row的哪个字段 */
+        disabledField?: string
         /** 多选框点击事件 */
         onChange?: (row: any, index: number) => void
       }
@@ -804,6 +816,7 @@ const columns = [
       defaultProps: {
         checkbox: {
           checkedIndeterminateField: 'halfChecked',
+          disabledField: 'checkedDisabled',
           onChange: (row, index) => {
             console.log('复选框变化', row)
           }

package/dist/index.mjs

@@ -258,42 +258,48 @@ function me(e) {
 //#endregion
 //#region lib/pretextTable/hook/useSort.ts
 function he(e) {
-	let { nowDataSource: t, getVisibleData: n, setNowDataSource: r, treeConfig: i, defaultTreeConfig: a } = e, o = g(""), s = g(null), c = (e, t) => {
+	let { nowDataSource: t, getVisibleData: n, setNowDataSource: r, treeConfig: i, defaultTreeConfig: a, columns: o } = e, s = g(""), c = "", l = g(null), u = (e, t) => {
+		let n = o?.value || [];
+		c = "";
+		for (let t of n) if (t.field === e) {
+			c = t.sortField || t.field;
+			break;
+		}
 		if (t === "auto") switch (!0) {
-			case e !== o.value:
-			case s.value === null:
-				s.value = "asc", o.value = e;
+			case e !== s.value:
+			case l.value === null:
+				l.value = "asc", s.value = e;
 				break;
-			case s.value === "asc":
-				s.value = "desc", o.value = e;
+			case l.value === "asc":
+				l.value = "desc", s.value = e;
 				break;
-			case s.value === "desc":
-				s.value = null, o.value = "";
+			case l.value === "desc":
+				l.value = null, s.value = "", c = "";
 				break;
 			default:
-				s.value = "asc", o.value = e;
+				l.value = "asc", s.value = e;
 				break;
 		}
-		else t === s.value && e === o.value ? (s.value = null, o.value = "") : (s.value = t, o.value = e);
-		u();
-	}, l = (e, t, n) => {
+		else t === l.value && e === s.value ? (l.value = null, s.value = "", c = "") : (l.value = t, s.value = e);
+		f();
+	}, d = (e, t, n) => {
 		let r = le(e, [[(e) => M(Number(e[t])) ? e[t] || "" : Number(e[t]), n]]);
 		if (i?.isOpenTree) {
 			let e = i?.childrenField || a?.childrenField;
 			for (let i of r) {
 				let r = i[e] || [];
-				r?.length && (i[e] = l(r, t, n));
+				r?.length && (i[e] = d(r, t, n));
 			}
 		}
 		return r;
-	}, u = () => {
-		s.value === null ? r(l(t.value, F.index, "asc")) : r(l(t.value, o.value, s.value)), n();
+	}, f = () => {
+		l.value === null ? r(d(t.value, F.index, "asc")) : r(d(t.value, c, l.value)), n();
 	};
 	return {
-		sortField: o,
-		sortOrder: s,
-		sort: c,
-		handleSort: u
+		sortField: s,
+		sortOrder: l,
+		sort: u,
+		handleSort: f
 	};
 }
 //#endregion
@@ -1075,7 +1081,8 @@ var _e = (e) => {
 		getVisibleData: H,
 		setNowDataSource: b,
 		treeConfig: e.props.treeConfig,
-		defaultTreeConfig: K
+		defaultTreeConfig: K,
+		columns: t
 	}), { filterPopupWidth: ht, filterPopupId: gt, inputFilterOptions: _t, numberFilterOptions: vt, filterFields: yt, getFilterFields: bt, filterClick: xt, setFilter: St, clearFilter: Ct } = ge({
 		columns: t,
 		baseDataSource: m,
@@ -1719,10 +1726,12 @@ var _e = (e) => {
 				])) : r("", !0)], 64)) : f.slots?.defaultType == "checkbox" ? (h(), i("span", Le, [s(S(k), {
 					modelValue: t[f.field],
 					indeterminate: f.slots?.defaultProps?.checkbox?.checkedIndeterminateField ? t[f.slots?.defaultProps?.checkbox?.checkedIndeterminateField] : !1,
+					disabled: f.slots?.defaultProps?.checkbox?.disabledField && t[f.slots?.defaultProps?.checkbox?.disabledField],
 					onChange: (e) => f.slots?.defaultProps?.checkbox?.onChange?.(t, g)
 				}, null, 8, [
 					"modelValue",
 					"indeterminate",
+					"disabled",
 					"onChange"
 				])])) : (h(), i("span", {
 					key: 10,

package/dist/lib/pretextTable/hook/useSort.d.ts

@@ -1,5 +1,5 @@
 import { ShallowRef } from 'vue';
-import { HolyesTableTreeConfig } from '../type';
+import { HolyesTableColumnPropsType, HolyesTableTreeConfig } from '../type';
 /** 排序 */
 export declare function useSort(dataObj: {
     nowDataSource: ShallowRef<any[]>;
@@ -8,6 +8,8 @@ export declare function useSort(dataObj: {
     treeConfig?: HolyesTableTreeConfig;
     /** 默认树配置 */
     defaultTreeConfig?: any;
+    /** 列配置 */
+    columns?: ShallowRef<HolyesTableColumnPropsType[]>;
 }): {
     /** 当前排序字段 */
     sortField: import('vue').Ref<string, string>;

package/dist/lib/pretextTable/type.d.ts

@@ -11,6 +11,8 @@ export type HolyesTableColumnPropsTypeOption = {
     fixed?: "left" | "right" | "";
     /** 列是否可排序 */
     sortable?: boolean;
+    /** 列排序实际的字段，默认值为列的field */
+    sortField?: string;
     /** 列类型 */
     type?: "seq" | "checkbox" | "expand";
     /** 列样式 */
@@ -116,6 +118,8 @@ export type HolyesTableColumnPropsTypeOption = {
             checkbox?: {
                 /** 多选框是否半选，取决于row的哪个字段 */
                 checkedIndeterminateField?: string;
+                /** 多选框是否禁用，取决于row的哪个字段 */
+                disabledField?: string;
                 /** 多选框点击事件 */
                 onChange?: (row: any, index: number) => void;
             };

package/package.json

@@ -1,53 +1,53 @@
-{
-  "name": "holyes-table",
-  "version": "1.0.15",
-  "description": "合力思虚拟滚动表格组件",
-  "main": "./dist/index.mjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/lib/main.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/lib/main.d.ts",
-      "import": "./dist/index.mjs",
-      "default": "./dist/index.mjs"
-    },
-    "./style.css": "./dist/index.css"
-  },
-  "files": [
-    "dist",
-    "skills",
-    "更新日志.md"
-  ],
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "prepublishOnly": "pnpm run build",
-    "登录npm": "npm login --registry https://registry.npmjs.org",
-    "发布npm": "npm publish --registry https://registry.npmjs.org",
-    "退出npm登录": "npm logout --registry https://registry.npmjs.org",
-    "查看npm登录": "npm whoami --registry https://registry.npmjs.org",
-    "补丁更新": "npm version patch --registry https://registry.npmjs.org",
-    "小功能更新": "npm version minor --registry https://registry.npmjs.org",
-    "大版本更新": "npm version major --registry https://registry.npmjs.org",
-    "废弃某个版本": "npm deprecate holyes-table@1.0.3 '请升级到版本1.0.4+' --registry https://registry.npmjs.org"
-  },
-  "peerDependencies": {
-    "vue": "^3.3.13",
-    "vxe-pc-ui": "^4.9.41",
-    "xe-utils": "^4.0.4"
-  },
-  "devDependencies": {
-    "@vitejs/plugin-vue": "^6.0.6",
-    "less": "^4.6.4",
-    "typescript": "~6.0.2",
-    "vite": "^8.0.3",
-    "vite-plugin-dts": "^5.0.0",
-    "vue": "^3.5.34",
-    "vue-tsc": "^2.2.12"
-  },
-  "dependencies": {
-    "normalize.css": "^8.0.1",
-    "vxe-pc-ui": "^4.14.11",
-    "xe-utils": "^4.0.7"
-  }
-}
+{
+  "name": "holyes-table",
+  "version": "1.0.17",
+  "description": "合力思虚拟滚动表格组件",
+  "main": "./dist/index.mjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/lib/main.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/lib/main.d.ts",
+      "import": "./dist/index.mjs",
+      "default": "./dist/index.mjs"
+    },
+    "./style.css": "./dist/index.css"
+  },
+  "files": [
+    "dist",
+    "skills",
+    "更新日志.md"
+  ],
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "prepublishOnly": "pnpm run build",
+    "登录npm": "npm login --registry https://registry.npmjs.org",
+    "发布npm": "npm publish --registry https://registry.npmjs.org",
+    "退出npm登录": "npm logout --registry https://registry.npmjs.org",
+    "查看npm登录": "npm whoami --registry https://registry.npmjs.org",
+    "补丁更新": "npm version patch --registry https://registry.npmjs.org",
+    "小功能更新": "npm version minor --registry https://registry.npmjs.org",
+    "大版本更新": "npm version major --registry https://registry.npmjs.org",
+    "废弃某个版本": "npm deprecate holyes-table@1.0.3 '请升级到版本1.0.4+' --registry https://registry.npmjs.org"
+  },
+  "peerDependencies": {
+    "vue": "^3.3.13",
+    "vxe-pc-ui": "^4.9.41",
+    "xe-utils": "^4.0.4"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-vue": "^6.0.6",
+    "less": "^4.6.4",
+    "typescript": "~6.0.2",
+    "vite": "^8.0.3",
+    "vite-plugin-dts": "^5.0.0",
+    "vue": "^3.5.34",
+    "vue-tsc": "^2.2.12"
+  },
+  "dependencies": {
+    "normalize.css": "^8.0.1",
+    "vxe-pc-ui": "^4.14.11",
+    "xe-utils": "^4.0.7"
+  }
+}