Commit Graph

109 Commits

Author SHA1 Message Date
zouzhibing
dfb6a38090 合并主分支 2022-07-28 14:33:02 +08:00
zouzhibing
fbe154c022 新增组件 2022-04-18 09:46:29 +08:00
zouzhibing
0b73f3d500 Merge branch 'zb-drawer' of https://github.com/zouzhibin/zb-table
 Conflicts:
	.idea/workspace.xml
	pages/index/index.nvue
	uni_modules/zb-drawer/components/zb-drawer/zb-drawer.vue
	uni_modules/zb-drawer/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/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/pages/index/index.wxss
	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/zb-table.js
2022-04-18 09:44:41 +08:00
zouzhibing
d0268142b3 提交 2022-04-18 09:42:54 +08:00
zouzhibing
63a4dc27c6 Merge branch 'multi-header' of https://github.com/zouzhibin/zb-table
 Conflicts:
	.idea/workspace.xml
	uni_modules/zb-table/components/zb-table/components/zb-loading.vue
	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-weixin/uni_modules/zb-table/components/zb-table/components/zb-load-more.wxss
2022-04-18 09:34:00 +08:00
zouzhibing
3de025fd30 提交 2022-04-18 09:33:02 +08:00
zouzhibing
bf7b166d04 新增手势滑动 2022-04-18 09:30:55 +08:00
zouzhibing
b5497dcf7a 提交 2022-04-15 17:56:43 +08:00
zouzhibing
6c2805c3a9 提交 2022-04-15 11:01:58 +08:00
zouzhibing
dcb3601dab 提交 2022-04-15 10:51:48 +08:00
zouzhibing
6a4ff55541 整合组件 2022-04-15 10:50:06 +08:00
zouzhibing
39a5208a3a Merge branch 'zb-pagination' of https://github.com/zouzhibin/zb-table
 Conflicts:
	.idea/workspace.xml
	pages.json
	pages/index/index.nvue
	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/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-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.wxml
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js
2022-04-15 10:32:29 +08:00
zouzhibing
e5fd2b1bf8 d 2022-04-15 10:31:06 +08:00
zouzhibing
0b6a08d84c 上传组件 2022-04-14 17:08:57 +08:00
zouzhibing
628ff2a581 Merge branch 'multi-header' of https://github.com/zouzhibin/zb-table
 Conflicts:
	.idea/workspace.xml
	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-weixin/app.json
	unpackage/dist/dev/mp-weixin/common/vendor.js
	unpackage/dist/dev/mp-weixin/pages/index/index.js
	unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.js
2022-04-14 16:37:25 +08:00
zouzhibing
cf1a091630 提交 2022-04-14 16:36:35 +08:00
zouzhibing
177da61bea 去掉console.log 2022-04-14 16:35:35 +08:00
zouzhibing
594446795f 增加多级表头 2022-04-14 16:16:53 +08:00
zouzhibing
aa8f55a2c0 修改 2022-04-14 15:22:22 +08:00
zouzhibing
8107801329 修改分页 2022-04-14 09:59:03 +08:00
zouzhibing
f34818363c 增加分页 2022-04-14 09:35:26 +08:00
zouzhibing
1cd9c104e4 增加分页 2022-04-13 17:57:50 +08:00
zouzhibing
22f647f215 增加数据 2022-04-13 11:50:33 +08:00
zouzhibing
ef9f7673dd 修改 2022-04-13 10:03:59 +08:00
zouzhibing
da87dab7d6 提交数据 2022-04-12 14:28:48 +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
d2fa1a1f9c 提交 2022-04-12 14:16:53 +08:00
zouzhibin
a02206d36e 修改展示 2022-04-11 21:13:23 +08:00
zouzhibin
6f013c6194 修改展示 2022-04-11 21:05:40 +08:00
zouzhibing
0251f12be7 修改readme.md 2022-04-11 18:39:01 +08:00
zouzhibing
8ffd5a917d 提交 2022-04-11 18:36:43 +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
597908e621 提交数据 2022-04-11 18:31:22 +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
d06d67556f 合并抽屉组件 2022-04-11 16:32:36 +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
181781916b 修改readme.md 2022-04-08 21:49:56 +08:00
zouzhibing
120adb6941 提交数据 2022-04-08 21:41:22 +08:00
zouzhibin
2c412148c2 合并 2022-04-08 20:57:49 +08:00