Commit Graph

38 Commits

Author SHA1 Message Date
zouzhibing
c41c064aeb 提交 2022-07-28 14:34:23 +08:00
zouzhibing
aac998ad6a Merge branch 'zb-drawer' of https://github.com/zouzhibin/zb-table
 Conflicts:
	.idea/workspace.xml
	uni_modules/zb-drawer/changelog.md
	uni_modules/zb-drawer/components/zb-drawer/zb-drawer.vue
	uni_modules/zb-drawer/package.json
	unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-summary.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js.map
	unpackage/dist/dev/mp-alipay/common/runtime.js
	unpackage/dist/dev/mp-alipay/common/vendor.js
	unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.js
	unpackage/dist/dev/mp-weixin/common/runtime.js
	unpackage/dist/dev/mp-weixin/common/vendor.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js
2022-04-12 14:19:59 +08:00
zouzhibing
ad05fe609e 提交 2022-04-12 14:17:41 +08:00
zouzhibing
0251f12be7 修改readme.md 2022-04-11 18:39:01 +08:00
zouzhibing
b60c074441 Merge branch 'multi-header' of https://github.com/zouzhibin/zb-table
 Conflicts:
	.idea/workspace.xml
	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js.map
2022-04-11 18:36:24 +08:00
zouzhibing
7f84264507 提交 2022-04-11 18:34:56 +08:00
zouzhibing
89b49fb86b 优化bug 2022-04-11 18:33:30 +08:00
zouzhibing
e661b641ae 提交数据 2022-04-11 18:23:23 +08:00
zouzhibing
143327614c Merge branch 'multi-header' of https://github.com/zouzhibin/zb-table
 Conflicts:
	.idea/workspace.xml
	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-checkbox.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-h5-summary.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-side-summary.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-summary.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/zb-load-more.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js.map
	unpackage/dist/dev/mp-alipay/pages/index/index.js
	unpackage/dist/dev/mp-weixin/pages/index/index.js
2022-04-11 18:21:39 +08:00
zouzhibing
39dd27cba5 数据缓存 2022-04-11 18:21:00 +08:00
zouzhibing
dc972be52b 增加格式化函数 2022-04-11 18:19:42 +08:00
zouzhibing
83e110d626 Merge branch 'zb-drawer' of https://github.com/zouzhibin/zb-table
 Conflicts:
	pages/table/all.js
	pages/table/index.vue
	unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
	unpackage/dist/dev/mp-alipay/common/runtime.js
	unpackage/dist/dev/mp-alipay/common/vendor.js
	unpackage/dist/dev/mp-alipay/pages/index/index.js
	unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.json
	unpackage/dist/dev/mp-weixin/common/runtime.js
	unpackage/dist/dev/mp-weixin/common/vendor.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.json
2022-04-11 16:30:48 +08:00
zouzhibing
2719b27a65 合并多级表头 2022-04-11 16:29:14 +08:00
zouzhibing
c3e262606e Merge branch 'multi-header' of https://github.com/zouzhibin/zb-table
 Conflicts:
	.idea/workspace.xml
	pages.json
	uni_modules/zb-table/changelog.md
	uni_modules/zb-table/package.json
	uni_modules/zb-table/readme.md
	unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-checkbox.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-h5-summary.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-side-summary.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-summary.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/zb-load-more.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js.map
	unpackage/dist/dev/mp-alipay/app.json
	unpackage/dist/dev/mp-alipay/common/runtime.js
	unpackage/dist/dev/mp-alipay/common/vendor.js
	unpackage/dist/dev/mp-alipay/pages/index/index.axml
	unpackage/dist/dev/mp-alipay/pages/index/index.js
	unpackage/dist/dev/mp-alipay/uni_modules/uni-card/components/uni-card/uni-card.js
	unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.axml
	unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.js
	unpackage/dist/dev/mp-weixin/app.json
	unpackage/dist/dev/mp-weixin/common/runtime.js
	unpackage/dist/dev/mp-weixin/common/vendor.js
	unpackage/dist/dev/mp-weixin/pages/index/index.js
	unpackage/dist/dev/mp-weixin/pages/index/index.wxml
	unpackage/dist/dev/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-checkbox.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-h5-summary.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-side-summary.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/table-summary.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/components/zb-load-more.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js
2022-04-11 16:26:37 +08:00
zouzhibing
397c1da25d 提交数据 2022-04-11 16:19:59 +08:00
zouzhibing
0270a7a9e1 增加loding 2022-04-11 16:18:45 +08:00
zouzhibing
5c0a2950bd 修改支付宝小程序问题 2022-04-11 13:39:59 +08:00
zouzhibing
120adb6941 提交数据 2022-04-08 21:41:22 +08:00
zouzhibing
1f71f3326d 增加多级表头 2022-04-08 18:44:09 +08:00
zouzhibing
5e04b468d7 提交 2022-04-08 12:00:29 +08:00
zouzhibing
edfcb4c88f 提交数据 2022-04-08 11:45:26 +08:00
zouzhibing
60d1e5edfc 增加抽屉组件 2022-04-08 11:02:33 +08:00
zouzhibing
0d6c9bd833 修改 回显问题 2022-03-25 14:42:56 +08:00
zouzhibing
380d1491c4 Merge branch 'cellStyle' of https://github.com/zouzhibin/zb-table
 Conflicts:
	.idea/workspace.xml
	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/zb-load-more.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js.map
	unpackage/dist/dev/mp-weixin/pages/index/index.js
	unpackage/dist/dev/mp-weixin/pages/index/index.wxml
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.wxml
2022-03-25 10:52:11 +08:00
zouzhibing
50206535d0 合并上拉加载 2022-03-25 10:50:25 +08:00
zouzhibing
2a62ff2096 Merge branch 'loadmore' of https://github.com/zouzhibin/zb-table
 Conflicts:
	.idea/workspace.xml
	unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/components/zb-load-more.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js.map
	unpackage/dist/dev/mp-alipay/.mini-ide/project-ide.json
	unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/zb-load-more.acss
	unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/components/zb-load-more.js
	unpackage/dist/dev/mp-weixin/common/runtime.js
	unpackage/dist/dev/mp-weixin/common/vendor.js
	unpackage/dist/dev/mp-weixin/pages/index/index.js
	unpackage/dist/dev/mp-weixin/pages/index/index.wxml
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.json
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.wxml
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.wxss
2022-03-25 10:24:32 +08:00
zouzhibing
2ae645af46 版本 2022-03-25 10:18:46 +08:00
zouzhibing
91dffaf60d 增加单元格的 设置颜色 2022-03-24 19:53:20 +08:00
zouzhibing
618f2cba23 修改支付宝小程序bug 2022-03-24 18:21:54 +08:00
zouzhibing
b19b268d11 修改一些bug 2022-03-24 18:21:23 +08:00
zouzhibing
987533974a 修改一些bug 2022-03-23 16:20:21 +08:00
zouzhibing
c52187d5f0 增加上拉加载功能 2022-03-18 17:45:17 +08:00
zouzhibing
7ef4367ea1 增加上拉加载功能 2022-03-18 17:36:55 +08:00
zouzhibing
fd1581a631 增加loadmore 2022-03-18 14:59:12 +08:00
zouzhibing
ca8566414d 修改一些bug 2022-03-17 17:16:24 +08:00
zouzhibing
70a2e9b23a 新增合计功能 2022-03-16 10:28:25 +08:00
zouzhibing
abb5365150 d 2022-03-10 15:20:04 +08:00
zouzhibing
957512cff5 提交 2022-03-09 19:22:07 +08:00