Commit Graph

6 Commits

Author SHA1 Message Date
zouzhibing
9b7184e37e Merge branch 'total' 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/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/table-checkbox.js.map
	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.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.json
	unpackage/dist/dev/mp-weixin/pages/index/index.wxml
	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/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
2022-03-16 10:43:15 +08:00
zouzhibing
b7d9d2b4bb 去掉多余的注释 2022-03-16 10:42:22 +08:00
zouzhibing
70a2e9b23a 新增合计功能 2022-03-16 10:28:25 +08:00
zouzhibing
abb5365150 d 2022-03-10 15:20:04 +08:00
zouzhibing
b67ab1ae57 增加checkbox 2022-03-10 15:03:34 +08:00
zouzhibing
957512cff5 提交 2022-03-09 19:22:07 +08:00