autumn/jsowell-charger-web

Fork 0

mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00

Files

Lemon f5e6e29f00 Merge branch 'dev-zza' into dev

# Conflicts:
#	jsowell-ui/.env.development
#	jsowell-ui/.env.staging
#	jsowell-ui/bin/build-sit.bat
#	jsowell-ui/bin/build.bat
#	jsowell-ui/src/api/adapayMember/adapayMember.js
#	jsowell-ui/src/api/pile/merchant.js
#	jsowell-ui/src/router/index.js
#	jsowell-ui/src/views/financial/financeDetail.vue
#	jsowell-ui/src/views/financial/merchant.vue
#	jsowell-ui/src/views/homeIndex/homeIndex.vue
#	jsowell-ui/src/views/login.vue
#	jsowell-ui/src/views/pile/basic/detail.vue
#	jsowell-ui/src/views/pile/station/components/SiteInfo.vue
#	jsowell-ui/src/views/pile/station/detail.vue
#	jsowell-ui/src/views/pile/station/orderReport.vue

2025-06-03 14:26:37 +08:00

4.9 KiB

Raw Blame History

1.5.2

fix: no longer attempts to merge React elements #76

1.5.1

bower support: officially dropping bower support. If you use bower, please depend on the unpkg distribution. See #63

1.5.0

bug fix: merging objects into arrays was allowed, and doesn't make any sense. #65 published as a feature release instead of a patch because it is a decent behavior change.

1.4.4

bower support: updated main in bower.json

1.4.3

bower support: inline is-mergeable-object in a new CommonJS build, so that people using both bower and CommonJS can bundle the library 0b34e6

1.4.2

performance: bump is-mergeable-object dependency version for a slight performance improvement 5906c7

1.4.1

documentation: fix unpkg link acc45b

1.4.0

api: instead of only exporting a UMD module, expose a UMD module with pkg.main, a CJS module with pkg.browser, and an ES module with pkg.module #62

1.3.2

documentation: note the minified/gzipped file sizes 56
documentation: make data structures more readable in merge example: pull request 57

1.3.1

documentation: clarify and test some array merging documentation: pull request 51

1.3.0

feature: merge.all, a merge function that merges any number of objects: pull request 50

1.2.0

fix: an error that would be thrown when an array would be merged onto a truthy non-array value: pull request 46
feature: the ability to clone: Issue 28, pull requests 44 and 48
maintenance: added tests + travis to .npmignore: pull request 47

1.1.1

fix an issue where an error was thrown when merging an array onto a non-array: Pull request 46

1.1.0

allow consumers to specify their own array merging algorithm: Pull request 37

1.0.3

adding bower.json back: Issue 38
updating keywords and Github links in package.json bc3898e

1.0.2

Updating the readme: dropping bower, testing that the example works: 7102fc

1.0.1

null, dates, and regular expressions are now properly merged in arrays: Issue 18, plus commit: ef1c6b

1.0.0

Should only be a patch change, because this module is READY. Issue 15
Regular expressions are now treated like primitive values when merging: Issue 30
Dates are now treated like primitives when merging: Issue 31

4.9 KiB Raw Blame History

1.0.0

4.9 KiB

Raw Blame History