Convert Chinese comments to English
This commit is contained in:
updsv7
404
.gitignore
vendored
404
.gitignore
vendored
@@ -1,202 +1,202 @@
|
|||||||
# ---> Python
|
# ---> Python
|
||||||
# Byte-compiled / optimized / DLL files
|
# Byte-compiled / optimized / DLL files
|
||||||
__pycache__/
|
__pycache__/
|
||||||
*.py[cod]
|
*.py[cod]
|
||||||
*$py.class
|
*$py.class
|
||||||
|
|
||||||
# C extensions
|
# C extensions
|
||||||
*.so
|
*.so
|
||||||
|
|
||||||
# Distribution / packaging
|
# Distribution / packaging
|
||||||
.Python
|
.Python
|
||||||
build/
|
build/
|
||||||
develop-eggs/
|
develop-eggs/
|
||||||
dist/
|
dist/
|
||||||
downloads/
|
downloads/
|
||||||
eggs/
|
eggs/
|
||||||
.eggs/
|
.eggs/
|
||||||
lib/
|
lib/
|
||||||
lib64/
|
lib64/
|
||||||
parts/
|
parts/
|
||||||
sdist/
|
sdist/
|
||||||
var/
|
var/
|
||||||
wheels/
|
wheels/
|
||||||
share/python-wheels/
|
share/python-wheels/
|
||||||
*.egg-info/
|
*.egg-info/
|
||||||
.installed.cfg
|
.installed.cfg
|
||||||
*.egg
|
*.egg
|
||||||
MANIFEST
|
MANIFEST
|
||||||
|
|
||||||
# PyInstaller
|
# PyInstaller
|
||||||
# Usually these files are written by a python script from a template
|
# Usually these files are written by a python script from a template
|
||||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||||
*.manifest
|
*.manifest
|
||||||
*.spec
|
*.spec
|
||||||
|
|
||||||
# Installer logs
|
# Installer logs
|
||||||
pip-log.txt
|
pip-log.txt
|
||||||
pip-delete-this-directory.txt
|
pip-delete-this-directory.txt
|
||||||
|
|
||||||
# Unit test / coverage reports
|
# Unit test / coverage reports
|
||||||
htmlcov/
|
htmlcov/
|
||||||
.tox/
|
.tox/
|
||||||
.nox/
|
.nox/
|
||||||
.coverage
|
.coverage
|
||||||
.coverage.*
|
.coverage.*
|
||||||
.cache
|
.cache
|
||||||
nosetests.xml
|
nosetests.xml
|
||||||
coverage.xml
|
coverage.xml
|
||||||
*.cover
|
*.cover
|
||||||
*.py,cover
|
*.py,cover
|
||||||
.hypothesis/
|
.hypothesis/
|
||||||
.pytest_cache/
|
.pytest_cache/
|
||||||
cover/
|
cover/
|
||||||
|
|
||||||
# Translations
|
# Translations
|
||||||
*.mo
|
*.mo
|
||||||
*.pot
|
*.pot
|
||||||
|
|
||||||
# Django stuff:
|
# Django stuff:
|
||||||
*.log
|
*.log
|
||||||
local_settings.py
|
local_settings.py
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
db.sqlite3-journal
|
db.sqlite3-journal
|
||||||
|
|
||||||
# Flask stuff:
|
# Flask stuff:
|
||||||
instance/
|
instance/
|
||||||
.webassets-cache
|
.webassets-cache
|
||||||
|
|
||||||
# Scrapy stuff:
|
# Scrapy stuff:
|
||||||
.scrapy
|
.scrapy
|
||||||
|
|
||||||
# Sphinx documentation
|
# Sphinx documentation
|
||||||
docs/_build/
|
docs/_build/
|
||||||
|
|
||||||
# PyBuilder
|
# PyBuilder
|
||||||
.pybuilder/
|
.pybuilder/
|
||||||
target/
|
target/
|
||||||
|
|
||||||
# Jupyter Notebook
|
# Jupyter Notebook
|
||||||
.ipynb_checkpoints
|
.ipynb_checkpoints
|
||||||
|
|
||||||
# IPython
|
# IPython
|
||||||
profile_default/
|
profile_default/
|
||||||
ipython_config.py
|
ipython_config.py
|
||||||
|
|
||||||
# pyenv
|
# pyenv
|
||||||
# For a library or package, you might want to ignore these files since the code is
|
# For a library or package, you might want to ignore these files since the code is
|
||||||
# intended to run in multiple environments; otherwise, check them in:
|
# intended to run in multiple environments; otherwise, check them in:
|
||||||
# .python-version
|
# .python-version
|
||||||
|
|
||||||
# pipenv
|
# pipenv
|
||||||
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
||||||
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
||||||
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
||||||
# install all needed dependencies.
|
# install all needed dependencies.
|
||||||
#Pipfile.lock
|
#Pipfile.lock
|
||||||
|
|
||||||
# UV
|
# UV
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
|
# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
|
||||||
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
||||||
# commonly ignored for libraries.
|
# commonly ignored for libraries.
|
||||||
#uv.lock
|
#uv.lock
|
||||||
|
|
||||||
# poetry
|
# poetry
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
||||||
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
||||||
# commonly ignored for libraries.
|
# commonly ignored for libraries.
|
||||||
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
||||||
#poetry.lock
|
#poetry.lock
|
||||||
|
|
||||||
# pdm
|
# pdm
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
||||||
#pdm.lock
|
#pdm.lock
|
||||||
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
|
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
|
||||||
# in version control.
|
# in version control.
|
||||||
# https://pdm.fming.dev/latest/usage/project/#working-with-version-control
|
# https://pdm.fming.dev/latest/usage/project/#working-with-version-control
|
||||||
.pdm.toml
|
.pdm.toml
|
||||||
.pdm-python
|
.pdm-python
|
||||||
.pdm-build/
|
.pdm-build/
|
||||||
|
|
||||||
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
||||||
__pypackages__/
|
__pypackages__/
|
||||||
|
|
||||||
# Celery stuff
|
# Celery stuff
|
||||||
celerybeat-schedule
|
celerybeat-schedule
|
||||||
celerybeat.pid
|
celerybeat.pid
|
||||||
|
|
||||||
# SageMath parsed files
|
# SageMath parsed files
|
||||||
*.sage.py
|
*.sage.py
|
||||||
|
|
||||||
# Environments
|
# Environments
|
||||||
.env
|
.env
|
||||||
.venv
|
.venv
|
||||||
env/
|
env/
|
||||||
venv/
|
venv/
|
||||||
ENV/
|
ENV/
|
||||||
env.bak/
|
env.bak/
|
||||||
venv.bak/
|
venv.bak/
|
||||||
|
|
||||||
# Spyder project settings
|
# Spyder project settings
|
||||||
.spyderproject
|
.spyderproject
|
||||||
.spyproject
|
.spyproject
|
||||||
|
|
||||||
# Rope project settings
|
# Rope project settings
|
||||||
.ropeproject
|
.ropeproject
|
||||||
|
|
||||||
# mkdocs documentation
|
# mkdocs documentation
|
||||||
/site
|
/site
|
||||||
|
|
||||||
# mypy
|
# mypy
|
||||||
.mypy_cache/
|
.mypy_cache/
|
||||||
.dmypy.json
|
.dmypy.json
|
||||||
dmypy.json
|
dmypy.json
|
||||||
|
|
||||||
# Pyre type checker
|
# Pyre type checker
|
||||||
.pyre/
|
.pyre/
|
||||||
|
|
||||||
# pytype static type analyzer
|
# pytype static type analyzer
|
||||||
.pytype/
|
.pytype/
|
||||||
|
|
||||||
# Cython debug symbols
|
# Cython debug symbols
|
||||||
cython_debug/
|
cython_debug/
|
||||||
|
|
||||||
# PyCharm
|
# PyCharm
|
||||||
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
||||||
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
||||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
#.idea/
|
#.idea/
|
||||||
|
|
||||||
# Ruff stuff:
|
# Ruff stuff:
|
||||||
.ruff_cache/
|
.ruff_cache/
|
||||||
|
|
||||||
# PyPI configuration file
|
# PyPI configuration file
|
||||||
.pypirc
|
.pypirc
|
||||||
|
|
||||||
# ---> Java
|
# ---> Java
|
||||||
# Compiled class file
|
# Compiled class file
|
||||||
*.class
|
*.class
|
||||||
|
|
||||||
# Log file
|
# Log file
|
||||||
*.log
|
*.log
|
||||||
|
|
||||||
# BlueJ files
|
# BlueJ files
|
||||||
*.ctxt
|
*.ctxt
|
||||||
|
|
||||||
# Mobile Tools for Java (J2ME)
|
# Mobile Tools for Java (J2ME)
|
||||||
.mtj.tmp/
|
.mtj.tmp/
|
||||||
|
|
||||||
# Package Files #
|
# Package Files #
|
||||||
*.jar
|
*.jar
|
||||||
*.war
|
*.war
|
||||||
*.nar
|
*.nar
|
||||||
*.ear
|
*.ear
|
||||||
*.zip
|
*.zip
|
||||||
*.tar.gz
|
*.tar.gz
|
||||||
*.rar
|
*.rar
|
||||||
|
|
||||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||||
hs_err_pid*
|
hs_err_pid*
|
||||||
replay_pid*
|
replay_pid*
|
||||||
|
|
||||||
|
|||||||
746
LICENSE
746
LICENSE
@@ -1,373 +1,373 @@
|
|||||||
Mozilla Public License Version 2.0
|
Mozilla Public License Version 2.0
|
||||||
==================================
|
==================================
|
||||||
|
|
||||||
1. Definitions
|
1. Definitions
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
1.1. "Contributor"
|
1.1. "Contributor"
|
||||||
means each individual or legal entity that creates, contributes to
|
means each individual or legal entity that creates, contributes to
|
||||||
the creation of, or owns Covered Software.
|
the creation of, or owns Covered Software.
|
||||||
|
|
||||||
1.2. "Contributor Version"
|
1.2. "Contributor Version"
|
||||||
means the combination of the Contributions of others (if any) used
|
means the combination of the Contributions of others (if any) used
|
||||||
by a Contributor and that particular Contributor's Contribution.
|
by a Contributor and that particular Contributor's Contribution.
|
||||||
|
|
||||||
1.3. "Contribution"
|
1.3. "Contribution"
|
||||||
means Covered Software of a particular Contributor.
|
means Covered Software of a particular Contributor.
|
||||||
|
|
||||||
1.4. "Covered Software"
|
1.4. "Covered Software"
|
||||||
means Source Code Form to which the initial Contributor has attached
|
means Source Code Form to which the initial Contributor has attached
|
||||||
the notice in Exhibit A, the Executable Form of such Source Code
|
the notice in Exhibit A, the Executable Form of such Source Code
|
||||||
Form, and Modifications of such Source Code Form, in each case
|
Form, and Modifications of such Source Code Form, in each case
|
||||||
including portions thereof.
|
including portions thereof.
|
||||||
|
|
||||||
1.5. "Incompatible With Secondary Licenses"
|
1.5. "Incompatible With Secondary Licenses"
|
||||||
means
|
means
|
||||||
|
|
||||||
(a) that the initial Contributor has attached the notice described
|
(a) that the initial Contributor has attached the notice described
|
||||||
in Exhibit B to the Covered Software; or
|
in Exhibit B to the Covered Software; or
|
||||||
|
|
||||||
(b) that the Covered Software was made available under the terms of
|
(b) that the Covered Software was made available under the terms of
|
||||||
version 1.1 or earlier of the License, but not also under the
|
version 1.1 or earlier of the License, but not also under the
|
||||||
terms of a Secondary License.
|
terms of a Secondary License.
|
||||||
|
|
||||||
1.6. "Executable Form"
|
1.6. "Executable Form"
|
||||||
means any form of the work other than Source Code Form.
|
means any form of the work other than Source Code Form.
|
||||||
|
|
||||||
1.7. "Larger Work"
|
1.7. "Larger Work"
|
||||||
means a work that combines Covered Software with other material, in
|
means a work that combines Covered Software with other material, in
|
||||||
a separate file or files, that is not Covered Software.
|
a separate file or files, that is not Covered Software.
|
||||||
|
|
||||||
1.8. "License"
|
1.8. "License"
|
||||||
means this document.
|
means this document.
|
||||||
|
|
||||||
1.9. "Licensable"
|
1.9. "Licensable"
|
||||||
means having the right to grant, to the maximum extent possible,
|
means having the right to grant, to the maximum extent possible,
|
||||||
whether at the time of the initial grant or subsequently, any and
|
whether at the time of the initial grant or subsequently, any and
|
||||||
all of the rights conveyed by this License.
|
all of the rights conveyed by this License.
|
||||||
|
|
||||||
1.10. "Modifications"
|
1.10. "Modifications"
|
||||||
means any of the following:
|
means any of the following:
|
||||||
|
|
||||||
(a) any file in Source Code Form that results from an addition to,
|
(a) any file in Source Code Form that results from an addition to,
|
||||||
deletion from, or modification of the contents of Covered
|
deletion from, or modification of the contents of Covered
|
||||||
Software; or
|
Software; or
|
||||||
|
|
||||||
(b) any new file in Source Code Form that contains any Covered
|
(b) any new file in Source Code Form that contains any Covered
|
||||||
Software.
|
Software.
|
||||||
|
|
||||||
1.11. "Patent Claims" of a Contributor
|
1.11. "Patent Claims" of a Contributor
|
||||||
means any patent claim(s), including without limitation, method,
|
means any patent claim(s), including without limitation, method,
|
||||||
process, and apparatus claims, in any patent Licensable by such
|
process, and apparatus claims, in any patent Licensable by such
|
||||||
Contributor that would be infringed, but for the grant of the
|
Contributor that would be infringed, but for the grant of the
|
||||||
License, by the making, using, selling, offering for sale, having
|
License, by the making, using, selling, offering for sale, having
|
||||||
made, import, or transfer of either its Contributions or its
|
made, import, or transfer of either its Contributions or its
|
||||||
Contributor Version.
|
Contributor Version.
|
||||||
|
|
||||||
1.12. "Secondary License"
|
1.12. "Secondary License"
|
||||||
means either the GNU General Public License, Version 2.0, the GNU
|
means either the GNU General Public License, Version 2.0, the GNU
|
||||||
Lesser General Public License, Version 2.1, the GNU Affero General
|
Lesser General Public License, Version 2.1, the GNU Affero General
|
||||||
Public License, Version 3.0, or any later versions of those
|
Public License, Version 3.0, or any later versions of those
|
||||||
licenses.
|
licenses.
|
||||||
|
|
||||||
1.13. "Source Code Form"
|
1.13. "Source Code Form"
|
||||||
means the form of the work preferred for making modifications.
|
means the form of the work preferred for making modifications.
|
||||||
|
|
||||||
1.14. "You" (or "Your")
|
1.14. "You" (or "Your")
|
||||||
means an individual or a legal entity exercising rights under this
|
means an individual or a legal entity exercising rights under this
|
||||||
License. For legal entities, "You" includes any entity that
|
License. For legal entities, "You" includes any entity that
|
||||||
controls, is controlled by, or is under common control with You. For
|
controls, is controlled by, or is under common control with You. For
|
||||||
purposes of this definition, "control" means (a) the power, direct
|
purposes of this definition, "control" means (a) the power, direct
|
||||||
or indirect, to cause the direction or management of such entity,
|
or indirect, to cause the direction or management of such entity,
|
||||||
whether by contract or otherwise, or (b) ownership of more than
|
whether by contract or otherwise, or (b) ownership of more than
|
||||||
fifty percent (50%) of the outstanding shares or beneficial
|
fifty percent (50%) of the outstanding shares or beneficial
|
||||||
ownership of such entity.
|
ownership of such entity.
|
||||||
|
|
||||||
2. License Grants and Conditions
|
2. License Grants and Conditions
|
||||||
--------------------------------
|
--------------------------------
|
||||||
|
|
||||||
2.1. Grants
|
2.1. Grants
|
||||||
|
|
||||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
Each Contributor hereby grants You a world-wide, royalty-free,
|
||||||
non-exclusive license:
|
non-exclusive license:
|
||||||
|
|
||||||
(a) under intellectual property rights (other than patent or trademark)
|
(a) under intellectual property rights (other than patent or trademark)
|
||||||
Licensable by such Contributor to use, reproduce, make available,
|
Licensable by such Contributor to use, reproduce, make available,
|
||||||
modify, display, perform, distribute, and otherwise exploit its
|
modify, display, perform, distribute, and otherwise exploit its
|
||||||
Contributions, either on an unmodified basis, with Modifications, or
|
Contributions, either on an unmodified basis, with Modifications, or
|
||||||
as part of a Larger Work; and
|
as part of a Larger Work; and
|
||||||
|
|
||||||
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
||||||
for sale, have made, import, and otherwise transfer either its
|
for sale, have made, import, and otherwise transfer either its
|
||||||
Contributions or its Contributor Version.
|
Contributions or its Contributor Version.
|
||||||
|
|
||||||
2.2. Effective Date
|
2.2. Effective Date
|
||||||
|
|
||||||
The licenses granted in Section 2.1 with respect to any Contribution
|
The licenses granted in Section 2.1 with respect to any Contribution
|
||||||
become effective for each Contribution on the date the Contributor first
|
become effective for each Contribution on the date the Contributor first
|
||||||
distributes such Contribution.
|
distributes such Contribution.
|
||||||
|
|
||||||
2.3. Limitations on Grant Scope
|
2.3. Limitations on Grant Scope
|
||||||
|
|
||||||
The licenses granted in this Section 2 are the only rights granted under
|
The licenses granted in this Section 2 are the only rights granted under
|
||||||
this License. No additional rights or licenses will be implied from the
|
this License. No additional rights or licenses will be implied from the
|
||||||
distribution or licensing of Covered Software under this License.
|
distribution or licensing of Covered Software under this License.
|
||||||
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
||||||
Contributor:
|
Contributor:
|
||||||
|
|
||||||
(a) for any code that a Contributor has removed from Covered Software;
|
(a) for any code that a Contributor has removed from Covered Software;
|
||||||
or
|
or
|
||||||
|
|
||||||
(b) for infringements caused by: (i) Your and any other third party's
|
(b) for infringements caused by: (i) Your and any other third party's
|
||||||
modifications of Covered Software, or (ii) the combination of its
|
modifications of Covered Software, or (ii) the combination of its
|
||||||
Contributions with other software (except as part of its Contributor
|
Contributions with other software (except as part of its Contributor
|
||||||
Version); or
|
Version); or
|
||||||
|
|
||||||
(c) under Patent Claims infringed by Covered Software in the absence of
|
(c) under Patent Claims infringed by Covered Software in the absence of
|
||||||
its Contributions.
|
its Contributions.
|
||||||
|
|
||||||
This License does not grant any rights in the trademarks, service marks,
|
This License does not grant any rights in the trademarks, service marks,
|
||||||
or logos of any Contributor (except as may be necessary to comply with
|
or logos of any Contributor (except as may be necessary to comply with
|
||||||
the notice requirements in Section 3.4).
|
the notice requirements in Section 3.4).
|
||||||
|
|
||||||
2.4. Subsequent Licenses
|
2.4. Subsequent Licenses
|
||||||
|
|
||||||
No Contributor makes additional grants as a result of Your choice to
|
No Contributor makes additional grants as a result of Your choice to
|
||||||
distribute the Covered Software under a subsequent version of this
|
distribute the Covered Software under a subsequent version of this
|
||||||
License (see Section 10.2) or under the terms of a Secondary License (if
|
License (see Section 10.2) or under the terms of a Secondary License (if
|
||||||
permitted under the terms of Section 3.3).
|
permitted under the terms of Section 3.3).
|
||||||
|
|
||||||
2.5. Representation
|
2.5. Representation
|
||||||
|
|
||||||
Each Contributor represents that the Contributor believes its
|
Each Contributor represents that the Contributor believes its
|
||||||
Contributions are its original creation(s) or it has sufficient rights
|
Contributions are its original creation(s) or it has sufficient rights
|
||||||
to grant the rights to its Contributions conveyed by this License.
|
to grant the rights to its Contributions conveyed by this License.
|
||||||
|
|
||||||
2.6. Fair Use
|
2.6. Fair Use
|
||||||
|
|
||||||
This License is not intended to limit any rights You have under
|
This License is not intended to limit any rights You have under
|
||||||
applicable copyright doctrines of fair use, fair dealing, or other
|
applicable copyright doctrines of fair use, fair dealing, or other
|
||||||
equivalents.
|
equivalents.
|
||||||
|
|
||||||
2.7. Conditions
|
2.7. Conditions
|
||||||
|
|
||||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
||||||
in Section 2.1.
|
in Section 2.1.
|
||||||
|
|
||||||
3. Responsibilities
|
3. Responsibilities
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
3.1. Distribution of Source Form
|
3.1. Distribution of Source Form
|
||||||
|
|
||||||
All distribution of Covered Software in Source Code Form, including any
|
All distribution of Covered Software in Source Code Form, including any
|
||||||
Modifications that You create or to which You contribute, must be under
|
Modifications that You create or to which You contribute, must be under
|
||||||
the terms of this License. You must inform recipients that the Source
|
the terms of this License. You must inform recipients that the Source
|
||||||
Code Form of the Covered Software is governed by the terms of this
|
Code Form of the Covered Software is governed by the terms of this
|
||||||
License, and how they can obtain a copy of this License. You may not
|
License, and how they can obtain a copy of this License. You may not
|
||||||
attempt to alter or restrict the recipients' rights in the Source Code
|
attempt to alter or restrict the recipients' rights in the Source Code
|
||||||
Form.
|
Form.
|
||||||
|
|
||||||
3.2. Distribution of Executable Form
|
3.2. Distribution of Executable Form
|
||||||
|
|
||||||
If You distribute Covered Software in Executable Form then:
|
If You distribute Covered Software in Executable Form then:
|
||||||
|
|
||||||
(a) such Covered Software must also be made available in Source Code
|
(a) such Covered Software must also be made available in Source Code
|
||||||
Form, as described in Section 3.1, and You must inform recipients of
|
Form, as described in Section 3.1, and You must inform recipients of
|
||||||
the Executable Form how they can obtain a copy of such Source Code
|
the Executable Form how they can obtain a copy of such Source Code
|
||||||
Form by reasonable means in a timely manner, at a charge no more
|
Form by reasonable means in a timely manner, at a charge no more
|
||||||
than the cost of distribution to the recipient; and
|
than the cost of distribution to the recipient; and
|
||||||
|
|
||||||
(b) You may distribute such Executable Form under the terms of this
|
(b) You may distribute such Executable Form under the terms of this
|
||||||
License, or sublicense it under different terms, provided that the
|
License, or sublicense it under different terms, provided that the
|
||||||
license for the Executable Form does not attempt to limit or alter
|
license for the Executable Form does not attempt to limit or alter
|
||||||
the recipients' rights in the Source Code Form under this License.
|
the recipients' rights in the Source Code Form under this License.
|
||||||
|
|
||||||
3.3. Distribution of a Larger Work
|
3.3. Distribution of a Larger Work
|
||||||
|
|
||||||
You may create and distribute a Larger Work under terms of Your choice,
|
You may create and distribute a Larger Work under terms of Your choice,
|
||||||
provided that You also comply with the requirements of this License for
|
provided that You also comply with the requirements of this License for
|
||||||
the Covered Software. If the Larger Work is a combination of Covered
|
the Covered Software. If the Larger Work is a combination of Covered
|
||||||
Software with a work governed by one or more Secondary Licenses, and the
|
Software with a work governed by one or more Secondary Licenses, and the
|
||||||
Covered Software is not Incompatible With Secondary Licenses, this
|
Covered Software is not Incompatible With Secondary Licenses, this
|
||||||
License permits You to additionally distribute such Covered Software
|
License permits You to additionally distribute such Covered Software
|
||||||
under the terms of such Secondary License(s), so that the recipient of
|
under the terms of such Secondary License(s), so that the recipient of
|
||||||
the Larger Work may, at their option, further distribute the Covered
|
the Larger Work may, at their option, further distribute the Covered
|
||||||
Software under the terms of either this License or such Secondary
|
Software under the terms of either this License or such Secondary
|
||||||
License(s).
|
License(s).
|
||||||
|
|
||||||
3.4. Notices
|
3.4. Notices
|
||||||
|
|
||||||
You may not remove or alter the substance of any license notices
|
You may not remove or alter the substance of any license notices
|
||||||
(including copyright notices, patent notices, disclaimers of warranty,
|
(including copyright notices, patent notices, disclaimers of warranty,
|
||||||
or limitations of liability) contained within the Source Code Form of
|
or limitations of liability) contained within the Source Code Form of
|
||||||
the Covered Software, except that You may alter any license notices to
|
the Covered Software, except that You may alter any license notices to
|
||||||
the extent required to remedy known factual inaccuracies.
|
the extent required to remedy known factual inaccuracies.
|
||||||
|
|
||||||
3.5. Application of Additional Terms
|
3.5. Application of Additional Terms
|
||||||
|
|
||||||
You may choose to offer, and to charge a fee for, warranty, support,
|
You may choose to offer, and to charge a fee for, warranty, support,
|
||||||
indemnity or liability obligations to one or more recipients of Covered
|
indemnity or liability obligations to one or more recipients of Covered
|
||||||
Software. However, You may do so only on Your own behalf, and not on
|
Software. However, You may do so only on Your own behalf, and not on
|
||||||
behalf of any Contributor. You must make it absolutely clear that any
|
behalf of any Contributor. You must make it absolutely clear that any
|
||||||
such warranty, support, indemnity, or liability obligation is offered by
|
such warranty, support, indemnity, or liability obligation is offered by
|
||||||
You alone, and You hereby agree to indemnify every Contributor for any
|
You alone, and You hereby agree to indemnify every Contributor for any
|
||||||
liability incurred by such Contributor as a result of warranty, support,
|
liability incurred by such Contributor as a result of warranty, support,
|
||||||
indemnity or liability terms You offer. You may include additional
|
indemnity or liability terms You offer. You may include additional
|
||||||
disclaimers of warranty and limitations of liability specific to any
|
disclaimers of warranty and limitations of liability specific to any
|
||||||
jurisdiction.
|
jurisdiction.
|
||||||
|
|
||||||
4. Inability to Comply Due to Statute or Regulation
|
4. Inability to Comply Due to Statute or Regulation
|
||||||
---------------------------------------------------
|
---------------------------------------------------
|
||||||
|
|
||||||
If it is impossible for You to comply with any of the terms of this
|
If it is impossible for You to comply with any of the terms of this
|
||||||
License with respect to some or all of the Covered Software due to
|
License with respect to some or all of the Covered Software due to
|
||||||
statute, judicial order, or regulation then You must: (a) comply with
|
statute, judicial order, or regulation then You must: (a) comply with
|
||||||
the terms of this License to the maximum extent possible; and (b)
|
the terms of this License to the maximum extent possible; and (b)
|
||||||
describe the limitations and the code they affect. Such description must
|
describe the limitations and the code they affect. Such description must
|
||||||
be placed in a text file included with all distributions of the Covered
|
be placed in a text file included with all distributions of the Covered
|
||||||
Software under this License. Except to the extent prohibited by statute
|
Software under this License. Except to the extent prohibited by statute
|
||||||
or regulation, such description must be sufficiently detailed for a
|
or regulation, such description must be sufficiently detailed for a
|
||||||
recipient of ordinary skill to be able to understand it.
|
recipient of ordinary skill to be able to understand it.
|
||||||
|
|
||||||
5. Termination
|
5. Termination
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
5.1. The rights granted under this License will terminate automatically
|
5.1. The rights granted under this License will terminate automatically
|
||||||
if You fail to comply with any of its terms. However, if You become
|
if You fail to comply with any of its terms. However, if You become
|
||||||
compliant, then the rights granted under this License from a particular
|
compliant, then the rights granted under this License from a particular
|
||||||
Contributor are reinstated (a) provisionally, unless and until such
|
Contributor are reinstated (a) provisionally, unless and until such
|
||||||
Contributor explicitly and finally terminates Your grants, and (b) on an
|
Contributor explicitly and finally terminates Your grants, and (b) on an
|
||||||
ongoing basis, if such Contributor fails to notify You of the
|
ongoing basis, if such Contributor fails to notify You of the
|
||||||
non-compliance by some reasonable means prior to 60 days after You have
|
non-compliance by some reasonable means prior to 60 days after You have
|
||||||
come back into compliance. Moreover, Your grants from a particular
|
come back into compliance. Moreover, Your grants from a particular
|
||||||
Contributor are reinstated on an ongoing basis if such Contributor
|
Contributor are reinstated on an ongoing basis if such Contributor
|
||||||
notifies You of the non-compliance by some reasonable means, this is the
|
notifies You of the non-compliance by some reasonable means, this is the
|
||||||
first time You have received notice of non-compliance with this License
|
first time You have received notice of non-compliance with this License
|
||||||
from such Contributor, and You become compliant prior to 30 days after
|
from such Contributor, and You become compliant prior to 30 days after
|
||||||
Your receipt of the notice.
|
Your receipt of the notice.
|
||||||
|
|
||||||
5.2. If You initiate litigation against any entity by asserting a patent
|
5.2. If You initiate litigation against any entity by asserting a patent
|
||||||
infringement claim (excluding declaratory judgment actions,
|
infringement claim (excluding declaratory judgment actions,
|
||||||
counter-claims, and cross-claims) alleging that a Contributor Version
|
counter-claims, and cross-claims) alleging that a Contributor Version
|
||||||
directly or indirectly infringes any patent, then the rights granted to
|
directly or indirectly infringes any patent, then the rights granted to
|
||||||
You by any and all Contributors for the Covered Software under Section
|
You by any and all Contributors for the Covered Software under Section
|
||||||
2.1 of this License shall terminate.
|
2.1 of this License shall terminate.
|
||||||
|
|
||||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
||||||
end user license agreements (excluding distributors and resellers) which
|
end user license agreements (excluding distributors and resellers) which
|
||||||
have been validly granted by You or Your distributors under this License
|
have been validly granted by You or Your distributors under this License
|
||||||
prior to termination shall survive termination.
|
prior to termination shall survive termination.
|
||||||
|
|
||||||
************************************************************************
|
************************************************************************
|
||||||
* *
|
* *
|
||||||
* 6. Disclaimer of Warranty *
|
* 6. Disclaimer of Warranty *
|
||||||
* ------------------------- *
|
* ------------------------- *
|
||||||
* *
|
* *
|
||||||
* Covered Software is provided under this License on an "as is" *
|
* Covered Software is provided under this License on an "as is" *
|
||||||
* basis, without warranty of any kind, either expressed, implied, or *
|
* basis, without warranty of any kind, either expressed, implied, or *
|
||||||
* statutory, including, without limitation, warranties that the *
|
* statutory, including, without limitation, warranties that the *
|
||||||
* Covered Software is free of defects, merchantable, fit for a *
|
* Covered Software is free of defects, merchantable, fit for a *
|
||||||
* particular purpose or non-infringing. The entire risk as to the *
|
* particular purpose or non-infringing. The entire risk as to the *
|
||||||
* quality and performance of the Covered Software is with You. *
|
* quality and performance of the Covered Software is with You. *
|
||||||
* Should any Covered Software prove defective in any respect, You *
|
* Should any Covered Software prove defective in any respect, You *
|
||||||
* (not any Contributor) assume the cost of any necessary servicing, *
|
* (not any Contributor) assume the cost of any necessary servicing, *
|
||||||
* repair, or correction. This disclaimer of warranty constitutes an *
|
* repair, or correction. This disclaimer of warranty constitutes an *
|
||||||
* essential part of this License. No use of any Covered Software is *
|
* essential part of this License. No use of any Covered Software is *
|
||||||
* authorized under this License except under this disclaimer. *
|
* authorized under this License except under this disclaimer. *
|
||||||
* *
|
* *
|
||||||
************************************************************************
|
************************************************************************
|
||||||
|
|
||||||
************************************************************************
|
************************************************************************
|
||||||
* *
|
* *
|
||||||
* 7. Limitation of Liability *
|
* 7. Limitation of Liability *
|
||||||
* -------------------------- *
|
* -------------------------- *
|
||||||
* *
|
* *
|
||||||
* Under no circumstances and under no legal theory, whether tort *
|
* Under no circumstances and under no legal theory, whether tort *
|
||||||
* (including negligence), contract, or otherwise, shall any *
|
* (including negligence), contract, or otherwise, shall any *
|
||||||
* Contributor, or anyone who distributes Covered Software as *
|
* Contributor, or anyone who distributes Covered Software as *
|
||||||
* permitted above, be liable to You for any direct, indirect, *
|
* permitted above, be liable to You for any direct, indirect, *
|
||||||
* special, incidental, or consequential damages of any character *
|
* special, incidental, or consequential damages of any character *
|
||||||
* including, without limitation, damages for lost profits, loss of *
|
* including, without limitation, damages for lost profits, loss of *
|
||||||
* goodwill, work stoppage, computer failure or malfunction, or any *
|
* goodwill, work stoppage, computer failure or malfunction, or any *
|
||||||
* and all other commercial damages or losses, even if such party *
|
* and all other commercial damages or losses, even if such party *
|
||||||
* shall have been informed of the possibility of such damages. This *
|
* shall have been informed of the possibility of such damages. This *
|
||||||
* limitation of liability shall not apply to liability for death or *
|
* limitation of liability shall not apply to liability for death or *
|
||||||
* personal injury resulting from such party's negligence to the *
|
* personal injury resulting from such party's negligence to the *
|
||||||
* extent applicable law prohibits such limitation. Some *
|
* extent applicable law prohibits such limitation. Some *
|
||||||
* jurisdictions do not allow the exclusion or limitation of *
|
* jurisdictions do not allow the exclusion or limitation of *
|
||||||
* incidental or consequential damages, so this exclusion and *
|
* incidental or consequential damages, so this exclusion and *
|
||||||
* limitation may not apply to You. *
|
* limitation may not apply to You. *
|
||||||
* *
|
* *
|
||||||
************************************************************************
|
************************************************************************
|
||||||
|
|
||||||
8. Litigation
|
8. Litigation
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
Any litigation relating to this License may be brought only in the
|
Any litigation relating to this License may be brought only in the
|
||||||
courts of a jurisdiction where the defendant maintains its principal
|
courts of a jurisdiction where the defendant maintains its principal
|
||||||
place of business and such litigation shall be governed by laws of that
|
place of business and such litigation shall be governed by laws of that
|
||||||
jurisdiction, without reference to its conflict-of-law provisions.
|
jurisdiction, without reference to its conflict-of-law provisions.
|
||||||
Nothing in this Section shall prevent a party's ability to bring
|
Nothing in this Section shall prevent a party's ability to bring
|
||||||
cross-claims or counter-claims.
|
cross-claims or counter-claims.
|
||||||
|
|
||||||
9. Miscellaneous
|
9. Miscellaneous
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
This License represents the complete agreement concerning the subject
|
This License represents the complete agreement concerning the subject
|
||||||
matter hereof. If any provision of this License is held to be
|
matter hereof. If any provision of this License is held to be
|
||||||
unenforceable, such provision shall be reformed only to the extent
|
unenforceable, such provision shall be reformed only to the extent
|
||||||
necessary to make it enforceable. Any law or regulation which provides
|
necessary to make it enforceable. Any law or regulation which provides
|
||||||
that the language of a contract shall be construed against the drafter
|
that the language of a contract shall be construed against the drafter
|
||||||
shall not be used to construe this License against a Contributor.
|
shall not be used to construe this License against a Contributor.
|
||||||
|
|
||||||
10. Versions of the License
|
10. Versions of the License
|
||||||
---------------------------
|
---------------------------
|
||||||
|
|
||||||
10.1. New Versions
|
10.1. New Versions
|
||||||
|
|
||||||
Mozilla Foundation is the license steward. Except as provided in Section
|
Mozilla Foundation is the license steward. Except as provided in Section
|
||||||
10.3, no one other than the license steward has the right to modify or
|
10.3, no one other than the license steward has the right to modify or
|
||||||
publish new versions of this License. Each version will be given a
|
publish new versions of this License. Each version will be given a
|
||||||
distinguishing version number.
|
distinguishing version number.
|
||||||
|
|
||||||
10.2. Effect of New Versions
|
10.2. Effect of New Versions
|
||||||
|
|
||||||
You may distribute the Covered Software under the terms of the version
|
You may distribute the Covered Software under the terms of the version
|
||||||
of the License under which You originally received the Covered Software,
|
of the License under which You originally received the Covered Software,
|
||||||
or under the terms of any subsequent version published by the license
|
or under the terms of any subsequent version published by the license
|
||||||
steward.
|
steward.
|
||||||
|
|
||||||
10.3. Modified Versions
|
10.3. Modified Versions
|
||||||
|
|
||||||
If you create software not governed by this License, and you want to
|
If you create software not governed by this License, and you want to
|
||||||
create a new license for such software, you may create and use a
|
create a new license for such software, you may create and use a
|
||||||
modified version of this License if you rename the license and remove
|
modified version of this License if you rename the license and remove
|
||||||
any references to the name of the license steward (except to note that
|
any references to the name of the license steward (except to note that
|
||||||
such modified license differs from this License).
|
such modified license differs from this License).
|
||||||
|
|
||||||
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
||||||
Licenses
|
Licenses
|
||||||
|
|
||||||
If You choose to distribute Source Code Form that is Incompatible With
|
If You choose to distribute Source Code Form that is Incompatible With
|
||||||
Secondary Licenses under the terms of this version of the License, the
|
Secondary Licenses under the terms of this version of the License, the
|
||||||
notice described in Exhibit B of this License must be attached.
|
notice described in Exhibit B of this License must be attached.
|
||||||
|
|
||||||
Exhibit A - Source Code Form License Notice
|
Exhibit A - Source Code Form License Notice
|
||||||
-------------------------------------------
|
-------------------------------------------
|
||||||
|
|
||||||
This Source Code Form is subject to the terms of the Mozilla Public
|
This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
If it is not possible or desirable to put the notice in a particular
|
If it is not possible or desirable to put the notice in a particular
|
||||||
file, then You may include the notice in a location (such as a LICENSE
|
file, then You may include the notice in a location (such as a LICENSE
|
||||||
file in a relevant directory) where a recipient would be likely to look
|
file in a relevant directory) where a recipient would be likely to look
|
||||||
for such a notice.
|
for such a notice.
|
||||||
|
|
||||||
You may add additional accurate notices of copyright ownership.
|
You may add additional accurate notices of copyright ownership.
|
||||||
|
|
||||||
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
||||||
---------------------------------------------------------
|
---------------------------------------------------------
|
||||||
|
|
||||||
This Source Code Form is "Incompatible With Secondary Licenses", as
|
This Source Code Form is "Incompatible With Secondary Licenses", as
|
||||||
defined by the Mozilla Public License, v. 2.0.
|
defined by the Mozilla Public License, v. 2.0.
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
Private Sub Worksheet_Change(ByVal Target As Range)
|
Private Sub Worksheet_Change(ByVal Target As Range)
|
||||||
' === G列变化时生成F列下拉列表(匹配冒号左边) ===
|
' === Generate F dropdown based on G column (matching left of colon) ===
|
||||||
If Target.Column = 7 And Target.Row >= 7 Then
|
If Target.Column = 7 And Target.Row >= 7 Then
|
||||||
If Target.Count > 1 Then Exit Sub
|
If Target.Count > 1 Then Exit Sub
|
||||||
Call MakeFDropdownByG(Me, Target.Row)
|
Call MakeFDropdownByG(Me, Target.Row)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
' === F列变化时提取冒号左边到G列 ===
|
' === Extract left of colon to G column when F changes ===
|
||||||
If Target.Column = 6 And Target.Row >= 7 Then
|
If Target.Column = 6 And Target.Row >= 7 Then
|
||||||
If Target.Count > 1 Then Exit Sub
|
If Target.Count > 1 Then Exit Sub
|
||||||
If Trim(Target.Value) <> "" Then
|
If Trim(Target.Value) <> "" Then
|
||||||
@@ -18,7 +18,7 @@ Private Sub Worksheet_Change(ByVal Target As Range)
|
|||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
' === C列变化时填充D、E ===
|
' === Fill D, E when C column changes ===
|
||||||
If Target.Column = 3 And Target.Row >= 7 Then
|
If Target.Column = 3 And Target.Row >= 7 Then
|
||||||
If Target.Count > 1 Then
|
If Target.Count > 1 Then
|
||||||
' Handle multiple cells
|
' Handle multiple cells
|
||||||
@@ -147,7 +147,7 @@ Sub ImportMasterDetailData()
|
|||||||
lines = Split(textContent, vbCrLf)
|
lines = Split(textContent, vbCrLf)
|
||||||
|
|
||||||
If UBound(lines) < 1 Then
|
If UBound(lines) < 1 Then
|
||||||
MsgBox "CSVにデータがありません。", vbExclamation
|
MsgBox "No data in CSV。", vbExclamation
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -169,7 +169,7 @@ NextCsvLine:
|
|||||||
Next i
|
Next i
|
||||||
|
|
||||||
If csvData.Count = 0 Then
|
If csvData.Count = 0 Then
|
||||||
MsgBox "有効なコードが見つかりません。", vbExclamation
|
MsgBox "No valid code found。", vbExclamation
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -200,7 +200,7 @@ NextCsvLine:
|
|||||||
' Auto-fill D, E columns from 区間メンテナンス
|
' Auto-fill D, E columns from 区間メンテナンス
|
||||||
Call FillFromKukanMaster(wsTarget, writeRow, False)
|
Call FillFromKukanMaster(wsTarget, writeRow, False)
|
||||||
|
|
||||||
' G列已有值 → 触发F下拉列表
|
' G column has value → trigger F dropdown
|
||||||
If Trim(wsTarget.Cells(writeRow, 7).Value) <> "" Then
|
If Trim(wsTarget.Cells(writeRow, 7).Value) <> "" Then
|
||||||
Call MakeFDropdownByG(wsTarget, writeRow)
|
Call MakeFDropdownByG(wsTarget, writeRow)
|
||||||
End If
|
End If
|
||||||
@@ -209,7 +209,7 @@ NextCsvLine:
|
|||||||
NextLine:
|
NextLine:
|
||||||
Next i
|
Next i
|
||||||
|
|
||||||
MsgBox writeRow - 7 & " 行を取り込みました。", vbInformation
|
MsgBox writeRow - 7 & " rows imported。", vbInformation
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Function CleanCSVField(ByVal field As Variant) As String
|
Function CleanCSVField(ByVal field As Variant) As String
|
||||||
@@ -282,11 +282,11 @@ Sub ClearRowData(ByVal ws As Worksheet, ByVal rowNum As Long)
|
|||||||
' Clear from D column onwards
|
' Clear from D column onwards
|
||||||
ws.Range(ws.Cells(rowNum, 4), ws.Cells(rowNum, 15)).ClearContents
|
ws.Range(ws.Cells(rowNum, 4), ws.Cells(rowNum, 15)).ClearContents
|
||||||
ws.Cells(rowNum, 6).Validation.Delete
|
ws.Cells(rowNum, 6).Validation.Delete
|
||||||
ws.Cells(rowNum, 17).ClearContents ' Q列错误信息
|
ws.Cells(rowNum, 17).ClearContents ' Q column error info
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Sub validateDetailData(ByVal ws As Worksheet, ByVal rowNum As Long, Optional ByVal isImport As Boolean = False)
|
Sub validateDetailData(ByVal ws As Worksheet, ByVal rowNum As Long, Optional ByVal isImport As Boolean = False)
|
||||||
' 关闭屏幕刷新和事件提升性能
|
' Disable screen update and calculation for performance
|
||||||
Application.ScreenUpdating = False
|
Application.ScreenUpdating = False
|
||||||
Application.Calculation = xlCalculationManual
|
Application.Calculation = xlCalculationManual
|
||||||
|
|
||||||
@@ -311,7 +311,7 @@ Sub validateDetailData(ByVal ws As Worksheet, ByVal rowNum As Long, Optional ByV
|
|||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
' === J列和K列必须为数字（不能为空） ===
|
' === J and K columns must be numeric (required) ===
|
||||||
jValue = Trim(ws.Cells(rowNum, 10).Value)
|
jValue = Trim(ws.Cells(rowNum, 10).Value)
|
||||||
kValue = Trim(ws.Cells(rowNum, 11).Value)
|
kValue = Trim(ws.Cells(rowNum, 11).Value)
|
||||||
|
|
||||||
@@ -322,7 +322,7 @@ Sub validateDetailData(ByVal ws As Worksheet, ByVal rowNum As Long, Optional ByV
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
If Not IsNumeric(jValue) Then
|
If Not IsNumeric(jValue) Then
|
||||||
errorMsg = "J列には数値を入力してください。"
|
errorMsg = "J列must be numeric。"
|
||||||
ws.Cells(rowNum, 17).Value = errorMsg
|
ws.Cells(rowNum, 17).Value = errorMsg
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
@@ -334,12 +334,12 @@ Sub validateDetailData(ByVal ws As Worksheet, ByVal rowNum As Long, Optional ByV
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
If Not IsNumeric(kValue) Then
|
If Not IsNumeric(kValue) Then
|
||||||
errorMsg = "K列には数値を入力してください。"
|
errorMsg = "K列must be numeric。"
|
||||||
ws.Cells(rowNum, 17).Value = errorMsg
|
ws.Cells(rowNum, 17).Value = errorMsg
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
' === L、M、N、O、P列如果输入必须为数字 ===
|
' === L, M, N, O, P columns must be numeric if entered ===
|
||||||
lValue = Trim(ws.Cells(rowNum, 12).Value)
|
lValue = Trim(ws.Cells(rowNum, 12).Value)
|
||||||
mValue = Trim(ws.Cells(rowNum, 13).Value)
|
mValue = Trim(ws.Cells(rowNum, 13).Value)
|
||||||
nValue = Trim(ws.Cells(rowNum, 14).Value)
|
nValue = Trim(ws.Cells(rowNum, 14).Value)
|
||||||
@@ -347,36 +347,36 @@ Sub validateDetailData(ByVal ws As Worksheet, ByVal rowNum As Long, Optional ByV
|
|||||||
pValue = Trim(ws.Cells(rowNum, 16).Value)
|
pValue = Trim(ws.Cells(rowNum, 16).Value)
|
||||||
|
|
||||||
If lValue <> "" And Not IsNumeric(lValue) Then
|
If lValue <> "" And Not IsNumeric(lValue) Then
|
||||||
errorMsg = "L列には数値を入力してください。"
|
errorMsg = "L列must be numeric。"
|
||||||
ws.Cells(rowNum, 17).Value = errorMsg
|
ws.Cells(rowNum, 17).Value = errorMsg
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If mValue <> "" And Not IsNumeric(mValue) Then
|
If mValue <> "" And Not IsNumeric(mValue) Then
|
||||||
errorMsg = "M列には数値を入力してください。"
|
errorMsg = "M列must be numeric。"
|
||||||
ws.Cells(rowNum, 17).Value = errorMsg
|
ws.Cells(rowNum, 17).Value = errorMsg
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If nValue <> "" And Not IsNumeric(nValue) Then
|
If nValue <> "" And Not IsNumeric(nValue) Then
|
||||||
errorMsg = "N列には数値を入力してください。"
|
errorMsg = "N列must be numeric。"
|
||||||
ws.Cells(rowNum, 17).Value = errorMsg
|
ws.Cells(rowNum, 17).Value = errorMsg
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If oValue <> "" And Not IsNumeric(oValue) Then
|
If oValue <> "" And Not IsNumeric(oValue) Then
|
||||||
errorMsg = "O列には数値を入力してください。"
|
errorMsg = "O列must be numeric。"
|
||||||
ws.Cells(rowNum, 17).Value = errorMsg
|
ws.Cells(rowNum, 17).Value = errorMsg
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If pValue <> "" And Not IsNumeric(pValue) Then
|
If pValue <> "" And Not IsNumeric(pValue) Then
|
||||||
errorMsg = "P列には数値を入力してください。"
|
errorMsg = "P列must be numeric。"
|
||||||
ws.Cells(rowNum, 17).Value = errorMsg
|
ws.Cells(rowNum, 17).Value = errorMsg
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
' === G、H、I列联合主键检查重复 ===
|
' === Check G, H, I composite key for duplicates ===
|
||||||
gValue = Trim(ws.Cells(rowNum, 7).Value)
|
gValue = Trim(ws.Cells(rowNum, 7).Value)
|
||||||
hValue = Trim(ws.Cells(rowNum, 8).Value)
|
hValue = Trim(ws.Cells(rowNum, 8).Value)
|
||||||
iValue = Trim(ws.Cells(rowNum, 9).Value)
|
iValue = Trim(ws.Cells(rowNum, 9).Value)
|
||||||
@@ -390,7 +390,7 @@ Sub validateDetailData(ByVal ws As Worksheet, ByVal rowNum As Long, Optional ByV
|
|||||||
If Trim(ws.Cells(i, 7).Value) = gValue And _
|
If Trim(ws.Cells(i, 7).Value) = gValue And _
|
||||||
Trim(ws.Cells(i, 8).Value) = hValue And _
|
Trim(ws.Cells(i, 8).Value) = hValue And _
|
||||||
Trim(ws.Cells(i, 9).Value) = iValue Then
|
Trim(ws.Cells(i, 9).Value) = iValue Then
|
||||||
errorMsg = "GHI列の組が既に存在します。"
|
errorMsg = "GHI列combination already exists。"
|
||||||
ws.Cells(rowNum, 17).Value = errorMsg
|
ws.Cells(rowNum, 17).Value = errorMsg
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
@@ -399,16 +399,16 @@ Sub validateDetailData(ByVal ws As Worksheet, ByVal rowNum As Long, Optional ByV
|
|||||||
Next i
|
Next i
|
||||||
End If
|
End If
|
||||||
|
|
||||||
' 验证通过，清除Q列错误信息
|
' Validation passed, clear Q column error
|
||||||
ws.Cells(rowNum, 17).Value = ""
|
ws.Cells(rowNum, 17).Value = ""
|
||||||
|
|
||||||
' 恢复设置
|
' Restore settings
|
||||||
Application.ScreenUpdating = True
|
Application.ScreenUpdating = True
|
||||||
Application.Calculation = xlCalculationAutomatic
|
Application.Calculation = xlCalculationAutomatic
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
' 按钮调用的宏（验证当前选中行）
|
' 按钮调用的宏（Validate selected row）
|
||||||
Sub validateDetailDataButton()
|
Sub validateDetailDataButton()
|
||||||
Dim rowNum As Long
|
Dim rowNum As Long
|
||||||
rowNum = ActiveCell.Row
|
rowNum = ActiveCell.Row
|
||||||
@@ -429,14 +429,14 @@ Sub ExportMasterDetailData()
|
|||||||
lastDataRow = ws.Cells(ws.Rows.Count, "C").End(xlUp).Row
|
lastDataRow = ws.Cells(ws.Rows.Count, "C").End(xlUp).Row
|
||||||
|
|
||||||
If lastDataRow < 7 Then
|
If lastDataRow < 7 Then
|
||||||
MsgBox "出力するデータ行がありません。", vbExclamation
|
MsgBox "No data rows to output。", vbExclamation
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Dim savePath As String
|
Dim savePath As String
|
||||||
savePath = Application.GetSaveAsFilename( _
|
savePath = Application.GetSaveAsFilename( _
|
||||||
FileFilter:="CSV Files (*.csv), *.csv", _
|
FileFilter:="CSV Files (*.csv), *.csv", _
|
||||||
Title:="CSV保存")
|
Title:="Save CSV")
|
||||||
|
|
||||||
If savePath = "False" Then Exit Sub
|
If savePath = "False" Then Exit Sub
|
||||||
If InStr(1, savePath, ".csv", vbTextCompare) = 0 Then
|
If InStr(1, savePath, ".csv", vbTextCompare) = 0 Then
|
||||||
@@ -481,5 +481,5 @@ Sub ExportMasterDetailData()
|
|||||||
stream.SaveToFile savePath, 2
|
stream.SaveToFile savePath, 2
|
||||||
stream.Close
|
stream.Close
|
||||||
|
|
||||||
MsgBox "CSV出力が完了しました。", vbInformation
|
MsgBox "CSV export completed。", vbInformation
|
||||||
End Sub
|
End Sub
|
||||||
Reference in New Issue
Block a user