fix: 修复临时密码提示翻译

fix: myorgs -> workbench_orgs

.env.development.example

@@ -20,6 +20,6 @@ VUE_APP_LOGOUT_PATH = '/core/auth/logout/'
 
 
 # Dev server for core proxy
-VUE_APP_CORE_HOST = 'http://localhost:8080/'
-VUE_APP_CORE_WS = 'http://localhost:8080/'
+VUE_APP_CORE_HOST = 'http://localhost:8080'
+VUE_APP_CORE_WS = 'ws://localhost:8080'
 VUE_APP_ENV = 'development'

Dockerfile

@@ -1,6 +1,4 @@
 FROM node:10 as stage-build
-ARG VERSION
-ENV VERSION=$VERSION
 ARG NPM_REGISTRY="https://registry.npm.taobao.org"
 ENV NPM_REGISTY=$NPM_REGISTRY
 ARG SASS_BINARY_SITE="https://npm.taobao.org/mirrors/node-sass"
@@ -15,6 +13,8 @@ COPY package.json yarn.lock /data/
 RUN yarn install
 RUN npm rebuild node-sass
 
+ARG VERSION
+ENV VERSION=$VERSION
 ADD . /data
 RUN cd utils && bash -xieu build.sh build
 

LICENSE

@@ -1,281 +1,622 @@
                     GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                       TERMS AND CONDITIONS
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+  0. Definitions.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  "This License" refers to version 3 of the GNU General Public License.
 
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+  1. Source Code.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  2. Basic Permissions.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+  13. Use with the GNU Affero General Public License.
 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  14. Revised Versions of this License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-                            NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  15. Disclaimer of Warranty.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
 
@@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {description}
-    Copyright (C) {year}  {fullname}
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -303,37 +644,31 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  {signature of Ty Coon}, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -19,7 +19,7 @@ VUE_APP_CORE_HOST = 'JUMPSERVER_APIHOST'
 $ yarn serve
 
 4. 构建
-$ yarn build
+$ yarn build:prod
 ```
 
 ## 生产中部署
@@ -46,12 +46,4 @@ server {
 
 
 ## License & Copyright
-Copyright (c) 2014-2021 飞致云 FIT2CLOUD, All rights reserved.
-
-Licensed under The GNU General Public License version 2 (GPLv2) (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-https://www.gnu.org/licenses/gpl-2.0.html
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-
+Be consistent with [jumpserver](https://github.com/jumpserver/jumpserver)

mock/user.js

@@ -1,4 +1,3 @@
-
 const tokens = {
   admin: {
     token: 'admin-token'
@@ -46,7 +45,6 @@ export default [
       }
     }
   },
-
   // get user info
   {
     url: '/vue-admin-template/user/info\.*',

package.json

@@ -58,6 +58,7 @@
     "vue-cookie": "^1.1.4",
     "vue-echarts": "^5.0.0-beta.0",
     "vue-i18n": "^8.15.5",
+    "vue-json-editor": "^1.4.3",
     "vue-moment": "^4.1.0",
     "vue-password-strength-meter": "^1.7.2",
     "vue-router": "3.0.6",

src/api/orgs.js

@@ -13,3 +13,9 @@ export function getCurrentOrg() {
     method: 'get'
   })
 }
+
+export default {
+  getCurrentOrg,
+  getOrgDetail
+}
+

src/api/users.js

@@ -69,3 +69,8 @@ export function logout() {
 export function refreshSessionIdAge() {
   return getProfile()
 }
+
+export default {
+  getProfile,
+  getUserList
+}

src/components/AccountListTable/ShowSecretInfo.vue

@@ -25,8 +25,8 @@
           <el-form-item :label="this.$t('assets.Password')">
             <el-input v-model="authInfo.password" type="password" show-password />
           </el-form-item>
-          <el-form-item :label="this.$t('assets.SSHKey')">
-            <el-input v-model="authInfo['private_key']" type="password" show-password />
+          <el-form-item :label="this.$t('users.SSHKey')">
+            <el-input v-model="authInfo['private_key']" class="item-textarea" type="textarea" show-password />
           </el-form-item>
         </el-form>
       </div>
@@ -79,5 +79,7 @@ export default {
 </script>
 
 <style scoped>
-
+  .item-textarea >>> .el-textarea__inner {
+    height: 110px;
+  }
 </style>

src/components/AccountListTable/UpdateSecretInfo.vue

@@ -2,13 +2,13 @@
   <Dialog
     width="50"
     :title="this.$t('assets.UpdateAssetUserToken')"
+    :visible.sync="visible"
     :destroy-on-close="true"
-    v-bind="$attrs"
     @confirm="handleConfirm()"
     @cancel="handleCancel()"
     v-on="$listeners"
   >
-    <el-form label-position="right" label-width="80px">
+    <el-form label-position="right" label-width="90px">
       <el-form-item :label="this.$t('assets.Hostname')">
         <el-input v-model="account.hostname" readonly />
       </el-form-item>
@@ -16,10 +16,13 @@
         <el-input v-model="account['username']" readonly />
       </el-form-item>
       <el-form-item :label="this.$t('assets.Password')">
-        <el-input v-model="authInfo.password" type="password" />
+        <UpdateToken v-model="authInfo.password" />
       </el-form-item>
-      <el-form-item :label="this.$t('assets.SSHKey')">
-        <input type="file" @change="onPrivateKeyLoaded">
+      <el-form-item :label="this.$t('assets.SSHSecretKey')">
+        <UploadKey @input="getFile" />
+      </el-form-item>
+      <el-form-item :label="this.$t('assets.Passphrase')">
+        <UpdateToken v-model="authInfo.passphrase" />
       </el-form-item>
     </el-form>
   </Dialog>
@@ -27,22 +30,30 @@
 
 <script>
 import Dialog from '@/components/Dialog'
+import { UpdateToken, UploadKey } from '@/components/FormFields'
 export default {
   name: 'UpdateSecretInfo',
   components: {
-    Dialog
+    Dialog,
+    UploadKey,
+    UpdateToken
   },
   props: {
     account: {
       type: Object,
       default: () => ({})
+    },
+    visible: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
     return {
       authInfo: {
         password: '',
-        private_key: ''
+        private_key: '',
+        passphrase: ''
       }
     }
   },
@@ -54,10 +65,12 @@ export default {
       }
       if (this.authInfo.private_key !== '') {
         data.private_key = this.authInfo.private_key
+        if (this.authInfo.passphrase) data.passphrase = this.authInfo.passphrase
       }
       this.$axios.patch(
         `/api/v1/assets/accounts/${this.account.id}/`,
-        data
+        data,
+        { disableFlashErrorMsg: true }
       ).then(res => {
         this.authInfo = { password: '', private_key: '' }
         this.$message.success(this.$tc('common.updateSuccessMsg'))
@@ -72,16 +85,8 @@ export default {
     handleCancel() {
       this.$emit('update:visible', false)
     },
-    onPrivateKeyLoaded(e) {
-      const vm = this
-      // TODO 校验文件类型
-      const reader = new FileReader()
-      reader.onload = function() {
-        vm.authInfo.private_key = this.result
-      }
-      reader.readAsText(
-        e.target.files[0]
-      )
+    getFile(file) {
+      this.authInfo.private_key = file
     }
   }
 }

src/components/AccountListTable/index.vue

@@ -2,7 +2,7 @@
   <div>
     <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
     <ShowSecretInfo v-if="showViewSecretDialog" :visible.sync="showViewSecretDialog" :account="account" />
-    <UpdateSecretInfo :visible.sync="showUpdateSecretDialog" :account="account" @updateAuthDone="onUpdateAuthDone" />
+    <UpdateSecretInfo v-if="showUpdateSecretDialog" :visible.sync="showUpdateSecretDialog" :account="account" @updateAuthDone="onUpdateAuthDone" />
   </div>
 </template>
 
@@ -46,12 +46,17 @@ export default {
     }
   },
   data() {
+    const vm = this
     return {
       showViewSecretDialog: false,
       showUpdateSecretDialog: false,
       account: {},
       tableConfig: {
         url: this.url,
+        permissions: {
+          app: 'assets',
+          resource: 'authbook'
+        },
         columns: [
           'hostname', 'ip', 'username', 'version', 'connectivity',
           'systemuser', 'date_created', 'date_updated', 'actions'
@@ -67,6 +72,7 @@ export default {
             showOverflowTooltip: true,
             formatter: DetailFormatter,
             formatterArgs: {
+              can: this.$hasPerm('assets.view_asset'),
               getRoute({ row }) {
                 return {
                   name: 'AssetDetail',
@@ -99,15 +105,17 @@ export default {
                 {
                   name: 'View',
                   title: this.$t('common.View'),
+                  can: this.$hasPerm('assets.view_assetaccountsecret'),
                   type: 'primary',
-                  callback: function({ row }) {
-                    this.account = row
-                    this.showViewSecretDialog = true
-                  }.bind(this)
+                  callback: ({ row }) => {
+                    vm.account = row
+                    vm.showViewSecretDialog = true
+                  }
                 },
                 {
                   name: 'Delete',
                   title: this.$t('common.Delete'),
+                  can: this.$hasPerm('assets.delete_authbook'),
                   type: 'primary',
                   callback: ({ row }) => {
                     this.$axios.delete(`/api/v1/assets/accounts/${row.id}/`).then(() => {
@@ -119,6 +127,7 @@ export default {
                 {
                   name: 'Test',
                   title: this.$t('common.Test'),
+                  can: this.$hasPerm('assets.test_authbook'),
                   callback: ({ row }) => {
                     this.$axios.post(
                       `/api/v1/assets/accounts/${row.id}/verify/`,
@@ -131,11 +140,16 @@ export default {
                 {
                   name: 'Update',
                   title: this.$t('common.Update'),
-                  can: !this.$store.getters.currentOrgIsRoot,
-                  callback: function({ row }) {
-                    this.account = row
-                    this.showUpdateSecretDialog = true
-                  }.bind(this)
+                  can: this.$hasPerm('assets.change_assetaccountsecret') && !this.$store.getters.currentOrgIsRoot,
+                  callback: ({ row }) => {
+                    vm.account = row
+                    vm.showUpdateSecretDialog = false
+                    setTimeout(() => {
+                      vm.showUpdateSecretDialog = true
+                      console.log('Show update1: ', vm.showUpdateSecretDialog)
+                    })
+                    console.log('Show update2: ', vm.showUpdateSecretDialog)
+                  }
                 }
               ]
             }
@@ -146,7 +160,7 @@ export default {
         hasLeftActions: this.hasLeftActions,
         hasMoreActions: false,
         hasImport: false,
-        hasExport: true,
+        hasExport: this.$hasPerm('assets.view_assetaccountsecret'),
         exportOptions: {
           url: this.exportUrl,
           mfaVerifyRequired: true
@@ -161,6 +175,7 @@ export default {
   watch: {
     url(iNew) {
       this.$set(this.tableConfig, 'url', iNew)
+      this.$set(this.headerActions.exportOptions, 'url', iNew.replace('/accounts/', '/account-secrets/'))
     }
   },
   mounted() {

src/components/Announcement/index.vue

@@ -7,7 +7,7 @@
     :title="title"
     @close="onClose"
   >
-    <span class="announcement-main"> {{ announcement.content }}</span>
+    <span class="announcement-main">{{ announcement.content }}</span>
     <span v-if="announcement.link">
       <el-link :href="announcement.link" target="_blank" class="link-more">
         {{ $t('common.ViewMore') }}
@@ -60,6 +60,7 @@ export default {
 }
 .announcement-main {
   word-wrap:break-word;
+  white-space: pre-wrap;
 }
 .link-more {
   font-size: 10px;

src/components/AppAccountListTable/index.vue

@@ -84,6 +84,7 @@ export default {
             showOverflowTooltip: true,
             formatter: DetailFormatter,
             formatterArgs: {
+              can: this.$hasPerm('assets.view_systemuser'),
               getTitle({ row }) {
                 return row.systemuser_display
               },
@@ -107,6 +108,7 @@ export default {
                   name: 'View',
                   title: this.$t('common.View'),
                   type: 'primary',
+                  can: this.$hasPerm('applications.view_applicationaccountsecret'),
                   callback: function({ row }) {
                     this.account = row
                     this.showViewSecretDialog = true
@@ -129,13 +131,13 @@ export default {
         hasLeftActions: this.hasLeftActions,
         hasMoreActions: false,
         hasImport: false,
-        hasExport: true,
+        hasExport: this.$hasPerm('applications.view_applicationaccountsecret'),
         exportOptions: {
           url: this.exportUrl,
           mfaVerifyRequired: true
         },
         searchConfig: {
-          exclude: ['systemuser', 'asset']
+          exclude: ['systemuser', 'app']
         },
         hasSearch: true
       }

src/components/AssetSelect/index.vue

@@ -13,7 +13,7 @@
       :title="this.$t('assets.Assets')"
       :visible.sync="dialogVisible"
       custom-class="asset-select-dialog"
-      width="70%"
+      width="80vw"
       top="1vh"
       @confirm="handleConfirm"
       @cancel="handleCancel"
@@ -192,7 +192,7 @@ export default {
   .el-dialog__wrapper  ::v-deep .el-dialog__body{
     padding: 5px 10px;
   }
-  .page  ::v-deep  .treebox{
+  .page  ::v-deep  .treebox {
     height: inherit !important;
   }
   .asset-select-dialog >>> .transition-box:first-child {

src/components/AutoDataForm/utils.js

@@ -18,6 +18,9 @@ export class FormFieldGenerator {
           })
         }
         break
+      case 'multiple choice':
+        field.el.choices = fieldRemoteMeta['choices']
+        break
       case 'datetime':
         type = 'date-picker'
         field.el = {

src/components/AutoDataSearch/index.vue

@@ -4,9 +4,12 @@
 
 <script>
 import TagSearch from '@/components/TagSearch'
+import i18n from '@/i18n/i18n'
 export default {
   name: 'AutoDataSearch',
-  components: { TagSearch },
+  components: {
+    TagSearch
+  },
   props: {
     url: {
       type: String,
@@ -78,8 +81,8 @@ export default {
         }
         if (field.type === 'boolean') {
           option.children = [
-            { label: this.$t('common.Yes'), value: true },
-            { label: this.$t('common.No'), value: false }
+            { label: i18n.t('common.Yes'), value: true },
+            { label: i18n.t('common.No'), value: false }
           ]
         }
         vm.internalOptions.push(option)

src/components/AutoDataTable/index.vue

@@ -64,7 +64,6 @@ export default {
     }
   },
   computed: {
-
   },
   watch: {
     config: {
@@ -174,8 +173,8 @@ export default {
         }
         if (column.type === 'boolean') {
           col.filters = [
-            { text: this.$t('common.Yes'), value: true },
-            { text: this.$t('common.No'), value: false }
+            { text: i18n.t('common.Yes'), value: true },
+            { text: i18n.t('common.No'), value: false }
           ]
           col.sortable = false
           col['column-key'] = col.prop
@@ -211,7 +210,7 @@ export default {
     },
     generateTotalColumns() {
       const config = _.cloneDeep(this.config)
-      const columns = []
+      let columns = []
       for (let col of config.columns) {
         if (typeof col === 'object') {
           columns.push(col)
@@ -220,6 +219,15 @@ export default {
           columns.push(col)
         }
       }
+      columns = columns.filter(item => {
+        let has = item.has
+        if (has === undefined) {
+          has = true
+        } else if (typeof has === 'function') {
+          has = has()
+        }
+        return has
+      })
       // 第一次初始化时记录 totalColumns
       this.totalColumns = columns
       config.columns = columns
@@ -274,8 +282,10 @@ export default {
       })
     },
     generatePopoverColumns() {
-      this.popoverColumns.totalColumnsList = this.totalColumns.map(obj => {
-        return { prop: obj.prop, label: obj.label }
+      this.popoverColumns.totalColumnsList = this.totalColumns.filter(obj => {
+        if (obj.label) {
+          return { prop: obj.prop, label: obj.label }
+        }
       })
       this.popoverColumns.currentCols = this.cleanedColumnsShow.show
       this.popoverColumns.minCols = this.cleanedColumnsShow.min

src/components/AutoDataZTree/index.vue

@@ -1,13 +1,13 @@
 <template>
   <DataZTree ref="dataztree" :setting="treeSetting" class="data-z-tree" v-on="$listeners">
     <slot v-if="treeSetting.hasRightMenu" slot="rMenu">
-      <li id="m_create" class="rmenu" tabindex="-1" @click="createTreeNode">
+      <li v-if="treeSetting.showCreate" id="m_create" class="rmenu" tabindex="-1" @click="createTreeNode">
         <i class="fa fa-plus-square-o" />  {{ this.$t('tree.CreateNode') }}
       </li>
-      <li id="m_edit" class="rmenu" tabindex="-1" @click="editTreeNode">
+      <li v-if="treeSetting.showUpdate" id="m_edit" class="rmenu" tabindex="-1" @click="editTreeNode">
         <i class="fa fa-pencil-square-o" />  {{ this.$t('tree.RenameNode') }}
       </li>
-      <li id="m_del" class="rmenu" tabindex="-1" @click="removeTreeNode">
+      <li v-if="treeSetting.showDelete" id="m_del" class="rmenu" tabindex="-1" @click="removeTreeNode">
         <i class="fa fa-minus-square" />  {{ this.$t('tree.DeleteNode') }}
       </li>
       <slot name="rMenu" />
@@ -34,6 +34,9 @@ export default {
   data() {
     return {
       defaultSetting: {
+        showCreate: true,
+        showDelete: true,
+        showUpdate: true,
         async: {
           enable: true,
           url: (process.env.VUE_APP_ENV === 'production') ? (`${this.setting.treeUrl}`) : (`${process.env.VUE_APP_BASE_API}${this.setting.treeUrl}`),
@@ -100,6 +103,9 @@ export default {
     // Request URL: http://localhost/api/v1/assets/assets/?node_id=d8212328-538d-41a6-bcfd-1e8cc7e3aed4&show_current_asset=null&draw=2&limit=15&offset=0&_=1587022917769
     onSelected: function(event, treeNode) {
       const show_current_asset = this.$cookie.get('show_current_asset') || '0'
+      if (!this.setting.url) {
+        return
+      }
       let combinator = '?'
       if (this.setting.url.indexOf('?') !== -1) {
         combinator = '&'
@@ -110,9 +116,11 @@ export default {
         this.currentNode = treeNode
         this.currentNodeId = treeNode.meta.data.id
         query['node'] = this.currentNodeId
+        query['asset'] = ''
         url = `${this.setting.url}${combinator}node_id=${treeNode.meta.data.id}&show_current_asset=${show_current_asset}`
       } else if (treeNode.meta.type === 'asset') {
         query['asset'] = treeNode.meta.data.id
+        query['node'] = ''
         url = `${this.setting.url}${combinator}asset_id=${treeNode.meta.data.id}&show_current_asset=${show_current_asset}`
       }
       this.$router.push({ query })

src/components/DataActions/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="grouped ? 'el-button-group' : 'el-button-ungroup'">
+  <div :class="grouped ? 'el-button-group' : 'el-button-ungroup'" class="layout">
     <template v-for="action in iActions">
       <el-dropdown
         v-if="action.dropdown"
@@ -13,9 +13,14 @@
         <el-button :size="size" v-bind="cleanButtonAction(action)">
           {{ action.title }}<i class="el-icon-arrow-down el-icon--right" />
         </el-button>
-        <el-dropdown-menu slot="dropdown">
+        <el-dropdown-menu slot="dropdown" style="overflow: auto;max-height: 60vh">
           <template v-for="option in action.dropdown">
-            <div v-if="option.group" :key="'group:'+option.name" class="dropdown-menu-title">
+            <div
+              v-if="option.group"
+              :key="'group:'+option.name"
+              class="dropdown-menu-title"
+              style="width:130px"
+            >
               {{ option.group }}
             </div>
             <el-dropdown-item
@@ -149,6 +154,11 @@ export default {
 </script>
 
 <style scoped>
+.layout {
+  display: flex;
+  justify-content: center;
+}
+
 .dropdown-menu-title {
   text-align: left;
   font-size: 12px;
@@ -165,7 +175,7 @@ export default {
 }
 
 .el-button-ungroup .action-item {
-  margin-left: 4px
+  margin-left: 4px;
 }
 
 .el-button-ungroup .action-item:first-child {

src/components/DataForm/index.vue

@@ -1,9 +1,10 @@
 <template>
   <ElFormRender
     ref="form"
+    :class="mobile? 'mobile' : 'desktop'"
     :content="fields"
     :form="basicForm"
-    label-position="right"
+    :label-position="labelPosition"
     label-width="20%"
     v-bind="$attrs"
     v-on="$listeners"
@@ -23,6 +24,7 @@
 
 <script>
 import ElFormRender from './components/el-form-renderer'
+import { scrollToError } from '@/utils'
 export default {
   components: {
     ElFormRender
@@ -67,6 +69,14 @@ export default {
       basicForm: this.form
     }
   },
+  computed: {
+    mobile() {
+      return this.$store.state.app.device === 'mobile'
+    },
+    labelPosition() {
+      return this.mobile ? 'top' : 'right'
+    }
+  },
   methods: {
     // 获取表单数据
     submitForm(formName, addContinue) {
@@ -76,6 +86,7 @@ export default {
           this.$emit('submit', form.getFormValue(), form, addContinue)
         } else {
           this.$emit('invalid', valid)
+          scrollToError(form.$el)
           return false
         }
       })
@@ -97,27 +108,35 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  .el-form  ::v-deep  .el-form-item {
+  .el-form ::v-deep .el-form-item {
     margin-bottom: 12px;
   }
 
-  .el-form  ::v-deep  .el-form-item__content {
+  .el-form ::v-deep .el-form-item__content {
     width: 75%;
   }
 
-  .el-form  ::v-deep  .el-form-item__label {
+  .mobile.el-form ::v-deep .el-form-item__content {
+    width: 100%;
+  }
+
+  .el-form ::v-deep .el-form-item__label {
     padding: 0 30px 0 0;
   }
 
-  .el-form  ::v-deep  .el-form-item__error {
+  .el-form ::v-deep .el-form-item__error {
      position: inherit;
   }
 
-  .el-form  ::v-deep  .form-group-header {
+  .el-form ::v-deep .form-group-header {
     margin-left: 50px;
   }
 
-  .el-form  ::v-deep  .help-block {
+  .el-form.mobile ::v-deep .form-group-header {
+    margin-left: 0;
+  }
+
+  .el-form ::v-deep .help-block {
     display: block;
     margin-top: 5px;
     margin-bottom: 10px;
@@ -125,7 +144,10 @@ export default {
     font-size: 12px;
     line-height: 18px;
   }
-  .el-form  ::v-deep  .help-block a {
+  .el-form ::v-deep .help-block a {
     color: #1c84c6;
   }
+  .form-buttons {
+    padding-top: 10px;
+  }
 </style>

src/components/Dialog/index.vue

@@ -2,8 +2,11 @@
   <el-dialog
     :title="title"
     :top="top"
+    :width="iWidth"
     class="dialog"
     v-bind="$attrs"
+    :append-to-body="false"
+    :modal-append-to-body="false"
     v-on="$listeners"
   >
     <slot />
@@ -38,6 +41,10 @@ export default {
       type: String,
       default: '3vh'
     },
+    width: {
+      type: String,
+      default: '60%'
+    },
     showConfirm: {
       type: Boolean,
       default: true
@@ -57,6 +64,11 @@ export default {
     return {
     }
   },
+  computed: {
+    iWidth() {
+      return this.$store.getters.isMobile ? '80%' : this.width
+    }
+  },
   methods: {
     onCancel() {
       this.$emit('cancel')

src/components/FormFields/DatetimeRangePicker.vue

@@ -91,18 +91,22 @@ export default {
 }
 </script>
 
-<style lang='less' scoped>
+<style lang='scss' scoped>
   .datepicker{
     width: 233px;
+    &>>> .el-range__icon {
+      margin-top: 2px;
+      margin-right: 3px;
+    }
+    &>>> .el-range-input {
+      width: 49%;
+    }
   }
   .el-input__inner{
     border: 1px solid #dcdee2;
     border-radius: 3px;
     height: 36px;
   }
-  /*.el-date-editor  ::v-deep  .el-input__icon{*/
-  /*  line-height: 28px;*/
-  /*}*/
   .el-date-editor  ::v-deep  .el-range-separator{
     line-height: 28px;
   }

src/components/FormFields/JsonEditor.vue

@@ -0,0 +1,73 @@
+<template>
+  <div class="json-editor">
+    <JsonEditor
+      v-model="resultInfo"
+      :show-btns="false"
+      :mode="'code'"
+      @json-change="onJsonChange"
+      @json-save="onJsonSave"
+      @has-error="onError"
+    />
+  </div>
+</template>
+
+<script>
+import JsonEditor from 'vue-json-editor'
+
+export default {
+  components: { JsonEditor },
+  props: {
+    value: {
+      type: String,
+      default: () => ''
+    }
+  },
+  data() {
+    return {
+      hasJsonFlag: true, // json是否验证通过
+      resultInfo: {}
+    }
+  },
+  created() {
+    this.resultInfo = JSON.parse(this.value)
+  },
+  methods: {
+    // 数据改变
+    onJsonChange(value) {
+      this.onJsonSave(value)
+    },
+    // 保存
+    onJsonSave(value) {
+      this.resultInfo = value
+      this.hasJsonFlag = true
+      setTimeout(() => {
+        this.$emit('change', JSON.stringify(this.resultInfo))
+      }, 500)
+    },
+    onError: _.debounce(function(value) {
+      this.$message.error(this.$t('common.FormatError'))
+    }, 1100)
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .json-editor {
+    &>>> .jsoneditor {
+      border: 1px solid #e5e6e7;
+    }
+    &>>> .jsoneditor-compact {
+      display: none;
+    }
+    &>>> .jsoneditor-modes {
+      display: none;
+    }
+    &>>> .jsoneditor-poweredBy {
+      display: none;
+    }
+    &>>> .jsoneditor-menu {
+      background: #1ab394;
+      border-bottom: 1px solid #1ab394;
+    }
+  }
+</style>

src/components/FormFields/Link.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-link @click="onClick">
+  <el-link :disabled="disabled" @click="onClick">
     {{ title }}
   </el-link>
 </template>
@@ -15,6 +15,10 @@ export default {
     title: {
       type: String,
       default: ''
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {

src/components/FormFields/Select2.vue

@@ -12,6 +12,7 @@
     filterable
     popper-append-to-body
     class="select2"
+    :disabled="selectDisabled"
     v-bind="$attrs"
     @change="onChange"
     @visible-change="onVisibleChange"
@@ -85,9 +86,14 @@ export default {
     disabledValues: {
       type: Array,
       default: () => []
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
+    const vm = this
     const defaultPageSize = 10
     const defaultParams = {
       search: '',
@@ -95,7 +101,20 @@ export default {
       hasMore: true,
       pageSize: defaultPageSize
     }
+    // 设置axios全局报错提示不显示
+    const validateStatus = (status) => {
+      if (status === 403) {
+        setTimeout(() => {
+          vm.initialized = true
+          vm.selectDisabled = true
+        }, 200)
+        return 200
+      }
+      return status
+    }
     return {
+      validateStatus,
+      selectDisabled: this.disabled,
       loading: false,
       initialized: false,
       defaultParams: _.cloneDeep(defaultParams),
@@ -143,10 +162,19 @@ export default {
       }
       const transformOption = this.ajax.transformOption || defaultTransformOption
       const defaultProcessResults = (data) => {
-        let results = data.results
+        let results = []
+        let more = false
+        let total = 0
+        if (Array.isArray(data)) {
+          results = data
+          total = data.length
+        } else if (typeof data === 'object') {
+          results = data?.results || []
+          more = !!data.next
+          total = data.count
+        }
         results = results.map(transformOption)
-        const more = !!data.next
-        const total = data.count
+        results = results.filter(Boolean)
         return { results: results, pagination: more, total: total }
       }
       const defaultAjax = {
@@ -154,7 +182,8 @@ export default {
         pageSize: defaultPageSize,
         makeParams: defaultMakeParams,
         transformOption: defaultTransformOption,
-        processResults: defaultProcessResults
+        processResults: defaultProcessResults,
+        validateStatus: this.validateStatus
       }
       return Object.assign(defaultAjax, this.ajax, this.url ? { url: this.url } : {})
     }
@@ -222,9 +251,13 @@ export default {
       this.getOptions()
     },
     async getInitialOptions() {
+      const { url, processResults, validateStatus } = this.iAjax
       const params = this.safeMakeParams(this.params)
-      let data = await this.$axios.get(this.iAjax.url, { params: params })
-      data = this.iAjax.processResults.bind(this)(data)
+      let data = await this.$axios.get(url, {
+        params,
+        validateStatus
+      })
+      data = processResults.bind(this)(data)
       data.results.forEach((v) => {
         this.initialOptions.push(v)
         if (this.optionsValues.indexOf(v.value) === -1) {
@@ -242,9 +275,13 @@ export default {
       }
     },
     async getOptions() {
+      const { url, processResults, validateStatus } = this.iAjax
       const params = this.safeMakeParams(this.params)
-      const resp = await this.$axios.get(this.iAjax.url, { params: params })
-      const data = this.iAjax.processResults.bind(this)(resp)
+      const resp = await this.$axios.get(url, {
+        params,
+        validateStatus
+      })
+      const data = processResults.bind(this)(resp)
       if (!data.pagination) {
         this.params.hasMore = false
       }
@@ -320,4 +357,8 @@ export default {
   .select2 {
     width: 100%;
   }
+  .select2 >>> .el-tag.el-tag--info {
+    height: auto;
+    white-space: normal;
+  }
 </style>

src/components/FormFields/Text.vue

@@ -0,0 +1,26 @@
+<template>
+  <span>
+    {{ text }}
+  </span>
+</template>
+
+<script>
+export default {
+  name: 'Text',
+  props: {
+    text: {
+      type: String,
+      default: ''
+    }
+  },
+  methods: {
+    onClick() {
+      window.open(this.href)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/FormFields/UpdateToken.vue

@@ -0,0 +1,60 @@
+<template>
+  <div>
+    <el-button v-show="!isShow" type="text" icon="el-icon-edit" @click="isShow=true">
+      {{ text }}
+    </el-button>
+    <el-input
+      v-show="isShow"
+      v-model.trim="curValue"
+      show-password
+      :type="type"
+      autocomplete="new-password"
+      :placeholder="placeholder"
+      @change="onChange"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: String,
+      default: () => ''
+    },
+    type: {
+      type: String,
+      default: () => 'input'
+    },
+    text: {
+      type: String,
+      default() {
+        return this.$t('common.Update')
+      }
+    },
+    placeholder: {
+      type: String,
+      default: () => ''
+    }
+  },
+  data() {
+    return {
+      isShow: false,
+      curValue: this.value
+    }
+  },
+  created() {
+    if (this.$route.path.indexOf('/create') !== -1) {
+      this.isShow = true
+    }
+  },
+  methods: {
+    onChange(e) {
+      this.$emit('input', this.curValue)
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/components/FormFields/UploadField.vue

@@ -1,6 +1,10 @@
 <template>
   <div>
-    <input type="file" @change="Onchange">
+    <input ref="upLoadFile" type="file" style="display: none" @change="Onchange">
+    <el-button size="mini" @click.native.stop="onUpLoad">
+      {{ this.$t('common.SelectFile') }}
+    </el-button>
+    <span>{{ fileName }}</span>
     <div v-if="tip !== ''">{{ tip }}</div>
     <input v-model="value" type="text" hidden v-on="$listeners">
     <div>
@@ -23,6 +27,7 @@ export default {
   },
   data() {
     return {
+      fileName: '',
       initial: this.value,
       preview: this.value
     }
@@ -34,16 +39,21 @@ export default {
     }
   },
   methods: {
+    onUpLoad() {
+      this.$refs.upLoadFile.click()
+    },
     onInput(val) {
       this.$emit('input', val)
     },
     Onchange(e) {
-      if (e.target.files[0] === undefined) {
+      const upLoadFile = e.target.files[0]
+      if (upLoadFile === undefined) {
         this.$emit('input', this.initial)
         return
       }
-      this.$emit('fileChange', e.target.files[0])
-      this.$emit('input', this.getObjectURL(e.target.files[0]))
+      this.fileName = upLoadFile?.name || ''
+      this.$emit('fileChange', upLoadFile)
+      this.$emit('input', this.getObjectURL(upLoadFile))
     },
     getObjectURL(file) {
       let url = null

src/components/FormFields/UploadKey.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="upload-key">
-    <input type="file" @change="onChange">
+    <input ref="upLoadFile" type="file" style="display: none" @change="onChange">
+    <el-button size="mini" @click.native.stop="onUpLoad">
+      {{ this.$t('common.SelectFile') }}
+    </el-button>
+    <span>{{ fileName }}</span>
     <div v-if="tip !== ''">{{ tip }}</div>
   </div>
 </template>
@@ -21,12 +25,22 @@ export default {
       default: () => 'string'
     }
   },
+  data() {
+    return {
+      fileName: ''
+    }
+  },
   methods: {
+    onUpLoad() {
+      this.$refs.upLoadFile.click()
+    },
     onChange(e) {
-      if (e.target.files.length === 0) {
+      const upLoadFile = e.target.files
+      if (upLoadFile.length === 0) {
         return
       }
       const vm = this
+      this.fileName = upLoadFile[0].name || ''
       const reader = new FileReader()
       reader.onload = function() {
         let result = this.result
@@ -36,7 +50,7 @@ export default {
         vm.$emit('input', result)
       }
       reader.readAsText(
-        e.target.files[0]
+        upLoadFile[0]
       )
     }
   }

src/components/FormFields/UserPassword.vue

@@ -32,16 +32,16 @@ export default {
         return callback()
       }
       const patterns = []
-      if (passwordRule.SECURITY_PASSWORD_UPPER_CASE) {
+      if (passwordRule['SECURITY_PASSWORD_UPPER_CASE']) {
         patterns.push([/[A-Z]/, i18n.t('common.password.UPPER_CASE_REQUIRED')])
       }
-      if (passwordRule.SECURITY_PASSWORD_LOWER_CASE) {
+      if (passwordRule['SECURITY_PASSWORD_LOWER_CASE']) {
         patterns.push([/[a-z]/, i18n.t('common.password.LOWER_CASE_REQUIRED')])
       }
-      if (passwordRule.SECURITY_PASSWORD_NUMBER) {
+      if (passwordRule['SECURITY_PASSWORD_NUMBER']) {
         patterns.push([/\d/, i18n.t('common.password.NUMBER_REQUIRED')])
       }
-      if (passwordRule.SECURITY_PASSWORD_SPECIAL_CHAR) {
+      if (passwordRule['SECURITY_PASSWORD_SPECIAL_CHAR']) {
         const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]")
         patterns.push([pattern, i18n.t('common.password.SPECIAL_CHAR_REQUIRED')])
       }
@@ -50,7 +50,7 @@ export default {
           return callback(new Error(msg))
         }
       }
-      let secureLength = passwordRule ? passwordRule.SECURITY_PASSWORD_MIN_LENGTH : 7
+      let secureLength = passwordRule ? passwordRule['SECURITY_PASSWORD_MIN_LENGTH'] : 7
       if (userIsOrgAdmin) {
         secureLength = passwordRule ? passwordRule.SECURITY_ADMIN_USER_PASSWORD_MIN_LENGTH : 7
       }

src/components/FormFields/index.js

@@ -7,6 +7,9 @@ import UploadField from './UploadField'
 import UploadKey from './UploadKey'
 import UserPassword from './UserPassword'
 import WeekCronSelect from './WeekCronSelect'
+import UpdateToken from './UpdateToken'
+import JsonEditor from './JsonEditor'
+import Text from './Text'
 
 export default {
   DatetimeRangePicker,
@@ -17,7 +20,10 @@ export default {
   UploadKey,
   UploadField,
   UserPassword,
-  WeekCronSelect
+  WeekCronSelect,
+  UpdateToken,
+  JsonEditor,
+  Text
 }
 
 export {
@@ -29,5 +35,8 @@ export {
   UploadKey,
   UploadField,
   UserPassword,
-  WeekCronSelect
+  WeekCronSelect,
+  UpdateToken,
+  JsonEditor,
+  Text
 }

src/components/Hamburger/index.vue

@@ -1,8 +1,6 @@
 <template>
-  <div style="">
-    <el-button type="primary" class="hamburger" size="mini" @click="toggleClick">
-      <i class="fa fa-bars" style="color: white; margin-right: 0" />
-    </el-button>
+  <div style="padding: 0 15px;" @click="toggleClick">
+    <svg-icon icon-class="hamburger" class="hamburger" :class="{'is-active':isActive}" />
   </div>
 </template>
 
@@ -25,11 +23,12 @@ export default {
 
 <style scoped>
 .hamburger {
- padding: 7px 12px;
+  display: inline-block;
+  vertical-align: middle;
+  font-size: 20px;
+  color: rgb(167, 177, 194);
 }
-
 .hamburger.is-active {
   transform: rotate(180deg);
 }
-
 </style>

src/components/ListTable/TableAction/ExportDialog.vue

@@ -92,11 +92,11 @@ export default {
       return this.selectedRows.length > 0
     },
     tableQuery() {
-      const listTableRef = this.$parent.$parent.$parent.$parent
+      const listTableRef = this.$parent?.$parent?.$parent?.$parent
       if (!listTableRef) {
         return {}
       }
-      const query = listTableRef.dataTable.getQuery()
+      const query = listTableRef?.dataTable?.getQuery() || {}
       delete query['limit']
       delete query['offset']
       delete query['date_from']
@@ -199,8 +199,11 @@ export default {
       this.mfaDialogShow = false
     },
     handleExportCancel() {
-      this.exportDialogShow = false
-      this.mfaDialogShow = false
+      const vm = this
+      setTimeout(() => {
+        vm.exportDialogShow = false
+        vm.mfaDialogShow = false
+      }, 100)
     }
   }
 }

src/components/ListTable/TableAction/ImportDialog.vue

@@ -13,8 +13,12 @@
   >
     <el-form v-if="!showTable" label-position="left" style="padding-left: 50px">
       <el-form-item :label="$t('common.Import' )" :label-width="'100px'">
-        <el-radio v-model="importOption" class="export-item" label="create">{{ this.$t('common.Create') }}</el-radio>
-        <el-radio v-model="importOption" class="export-item" label="update">{{ this.$t('common.Update') }}</el-radio>
+        <el-radio v-if="canImportCreate" v-model="importOption" class="export-item" label="create">
+          {{ this.$t('common.Create') }}
+        </el-radio>
+        <el-radio v-if="canImportUpdate" v-model="importOption" class="export-item" label="update">
+          {{ this.$t('common.Update') }}
+        </el-radio>
         <div style="line-height: 1.5">
           <span class="el-upload__tip">
             {{ downloadTemplateTitle }}
@@ -77,12 +81,20 @@ export default {
     url: {
       type: String,
       default: () => ''
+    },
+    canImportCreate: {
+      type: Boolean,
+      default: false
+    },
+    canImportUpdate: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
     return {
       showImportDialog: false,
-      importOption: 'create',
+      importOption: this.canImportCreate && this.canImportUpdate ? 'create' : this.canImportCreate ? 'create' : 'update',
       errorMsg: '',
       loadStatus: false,
       importTypeOption: 'csv',

src/components/ListTable/TableAction/ImportTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="8">
+      <el-col :md="8" :sm="24">
         <div class="tableFilter">
           <el-radio-group v-model="importStatusFilter" size="small">
             <el-radio-button label="all">{{ $t('common.Total') }}</el-radio-button>
@@ -11,7 +11,7 @@
           </el-radio-group>
         </div>
       </el-col>
-      <el-col :span="8" style="text-align: center">
+      <el-col :md="8" :sm="24" style="text-align: center">
         <span class="summary-item summary-total"> {{ $t('common.Total') }}: {{ totalCount }}</span>
         <span class="summary-item summary-success"> {{ $t('common.Success') }}: {{ successCount }}</span>
         <span class="summary-item summary-failed"> {{ $t('common.Failed') }}: {{ failedCount }}</span>

src/components/ListTable/TableAction/LeftSide.vue

@@ -35,7 +35,9 @@ export default {
       default: false
     },
     hasBulkDelete: defaultTrue,
+    canBulkDelete: defaultTrue,
     hasBulkUpdate: defaultFalse,
+    canBulkUpdate: defaultTrue,
     hasMoreActions: defaultTrue,
     tableUrl: {
       type: String,
@@ -98,6 +100,7 @@ export default {
       const createCreateAction = Object.assign(defaultMoreCreate, this.moreCreates)
       defaultActions.push(createCreateAction)
     }
+    const vm = this
     return {
       defaultActions: defaultActions,
       defaultMoreActions: [
@@ -107,7 +110,7 @@ export default {
           has: this.hasBulkDelete,
           can({ selectedRows }) {
             // vm.$log.debug('Delete select rows length: ', selectedRows.length)
-            return selectedRows.length > 0
+            return selectedRows.length > 0 && vm.canBulkDelete
           },
           callback: this.defaultBulkDeleteCallback
         },
@@ -115,7 +118,9 @@ export default {
           title: this.$t('common.updateSelected'),
           name: 'actionUpdateSelected',
           has: this.hasBulkUpdate,
-          can: ({ selectedRows }) => selectedRows.length > 0,
+          can: ({ selectedRows }) => {
+            return selectedRows.length > 0 && vm.canBulkUpdate
+          },
           callback: this.handleBulkUpdate
         }
       ]
@@ -136,7 +141,7 @@ export default {
       if (!this.hasMoreActions) {
         return
       }
-      let dropdown = [...this.defaultMoreActions, ...this.extraMoreActions]
+      let dropdown = _.uniqBy([...this.extraMoreActions, ...this.defaultMoreActions], 'name')
       dropdown = cleanActions(dropdown, true, {
         selectedRows: this.selectedRows,
         reloadTable: this.reloadTable

src/components/ListTable/TableAction/RightSide.vue

@@ -76,6 +76,14 @@ export default {
     extraRightSideActions: {
       type: Array,
       default: () => []
+    },
+    canCreate: {
+      type: Boolean,
+      default: false
+    },
+    canBulkUpdate: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -102,7 +110,11 @@ export default {
       return this.selectedRows.length > 0
     },
     iImportOptions() {
-      return assignIfNot(this.importOptions, { url: this.tableUrl })
+      return assignIfNot(this.importOptions, {
+        url: this.tableUrl,
+        canImportCreate: this.canCreate,
+        canImportUpdate: this.canBulkUpdate
+      })
     },
     iExportOptions() {
       const options = assignIfNot(this.exportOptions, { url: this.tableUrl })
@@ -164,8 +176,4 @@ export default {
     justify-content:center;
   }
 
-  .export-item {
-
-  }
-
 </style>

src/components/ListTable/TableAction/index.vue

@@ -1,17 +1,11 @@
 <template>
-  <div class="table-header">
+  <div class="table-header clearfix" :class="device">
     <slot name="header">
-      <div class="table-header-left-side">
-        <LeftSide v-if="hasLeftActions" :selected-rows="selectedRows" :table-url="tableUrl" v-bind="$attrs" v-on="$listeners" />
-        <span v-else style="display: flex;flex-direction: row">
-          <AutoDataSearch v-if="hasSearch" class="right-side-item action-search" v-bind="iSearchTableConfig" @tagSearch="handleTagSearch" />
-          <DatetimeRangePicker v-if="hasDatePicker" v-bind="datePicker" class="datepicker" @dateChange="handleDateChange" />
-        </span>
-      </div>
-      <div class="table-action-right-side">
-        <AutoDataSearch v-if="hasLeftActions && hasSearch" class="right-side-item action-search" v-bind="iSearchTableConfig" @tagSearch="handleTagSearch" />
-        <DatetimeRangePicker v-if="hasDatePicker && hasLeftActions" v-bind="datePicker" class="datepicker" @dateChange="handleDateChange" />
-        <RightSide v-if="hasRightActions" :selected-rows="selectedRows" :table-url="tableUrl" v-bind="$attrs" v-on="$listeners" />
+      <LeftSide v-if="hasLeftActions" class="left-side" :selected-rows="selectedRows" :table-url="tableUrl" v-bind="$attrs" v-on="$listeners" />
+      <RightSide v-if="hasRightActions" class="right-side" :selected-rows="selectedRows" :table-url="tableUrl" v-bind="$attrs" v-on="$listeners" />
+      <div class="search" :class="searchClass">
+        <AutoDataSearch v-if="hasSearch" class="right-side-item action-search" v-bind="iSearchTableConfig" @tagSearch="handleTagSearch" />
+        <DatetimeRangePicker v-if="hasDatePicker" v-bind="datePicker" class="datepicker" @dateChange="handleDateChange" />
       </div>
     </slot>
   </div>
@@ -77,6 +71,15 @@ export default {
         url: this.tableUrl
       }
       return Object.assign(configDefault, this.searchConfig)
+    },
+    device() {
+      if (this.$store.state.app.device === 'mobile') {
+        return 'mobile'
+      }
+      return ''
+    },
+    searchClass() {
+      return this.hasLeftActions ? 'right' : 'left'
     }
   },
   methods: {
@@ -92,9 +95,9 @@ export default {
 
 <style scoped>
   .table-header {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
+    /*display: flex;*/
+    /*flex-direction: row;*/
+    /*justify-content: space-between;*/
   }
 
   .right-side-item {
@@ -143,5 +146,34 @@ export default {
   .datepicker{
     margin-left: 10px;
   }
-
+  .left-side {
+    float: left;
+    display: block;
+    line-height: 36px;
+  }
+  .right-side {
+    float: right;
+  }
+  .search {
+    display: flex;
+    flex-direction: row
+  }
+  .mobile .search {
+    display: inherit;
+  }
+  .mobile .search .datepicker {
+    margin-left: 0;
+  }
+  .search.left {
+    float: left;
+  }
+  .search.right {
+    float: right;
+  }
+  .mobile .search.right {
+    float: left;
+  }
+  .mobile .right-side {
+    padding-top: 5px;
+  }
 </style>

src/components/ListTable/index.vue

@@ -6,7 +6,7 @@
       :date-pick="handleDateChange"
       :selected-rows="selectedRows"
       :reload-table="reloadTable"
-      v-bind="headerActions"
+      v-bind="iHeaderActions"
     />
     <IBox class="table-content">
       <AutoDataTable
@@ -25,7 +25,9 @@ import AutoDataTable from '../AutoDataTable'
 import IBox from '../IBox'
 import TableAction from './TableAction'
 import Emitter from '@/mixins/emitter'
+import { getResourceFromApiUrl } from '@/utils/jms'
 import deepmerge from 'deepmerge'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'ListTable',
@@ -55,17 +57,65 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['currentOrgIsRoot']),
     dataTable() {
       return this.$refs.dataTable.$refs.dataTable
     },
+    iHeaderActions() {
+      const actions = {
+        canCreate: { action: 'add', checkRoot: true },
+        canBulkDelete: { action: 'delete', checkRoot: false },
+        canBulkUpdate: { action: 'change', checkRoot: true },
+        hasImport: { action: 'add|change', checkRoot: true },
+        hasExport: { action: 'view', checkRoot: false }
+      }
+      const defaults = {}
+      for (const [k, v] of Object.entries(actions)) {
+        let hasPerm = v.action.split('|').some(i => this.hasActionPerm(i.trim()))
+        if (v.checkRoot) {
+          hasPerm = hasPerm && !this.currentOrgIsRoot
+        }
+        defaults[k] = hasPerm
+      }
+      return Object.assign(defaults, this.headerActions)
+    },
     iTableConfig() {
-      const config = deepmerge(this.tableConfig, { extraQuery: this.extraQuery })
+      const config = deepmerge(this.tableConfig, {
+        extraQuery: this.extraQuery
+      })
+      const formatterArgs = {
+        'columnsMeta.actions.formatterArgs.canUpdate': 'change',
+        'columnsMeta.actions.formatterArgs.canDelete': 'delete',
+        'columnsMeta.actions.formatterArgs.canClone': 'add',
+        'columnsMeta.name.formatterArgs.can': 'view'
+      }
+      for (const [arg, action] of Object.entries(formatterArgs)) {
+        const notSet = _.get(config, arg) === undefined
+        if (notSet) {
+          _.set(config, arg, this.hasActionPerm(action))
+        }
+      }
       this.$log.debug('Header actions', this.headerActions)
       this.$log.debug('ListTable: iTableConfig change', config)
       return config
     },
     tableUrl() {
-      return this.iTableConfig.url
+      return this.tableConfig.url
+    },
+    permissions() {
+      // 获取 permissions，获取不到通过 url 解析
+      const permissions = this.tableConfig.permissions || {}
+      const { app: apiApp, resource: apiResource } = getResourceFromApiUrl(this.tableUrl)
+      const app = permissions.app || apiApp
+      const resource = permissions.resource || apiResource
+      const actions = ['add', 'change', 'delete', 'view']
+      const defaultPermissions = actions.reduce((result, action) => {
+        result[action] = `${app}.${action}_${resource}`
+        return result
+      }, {})
+      const perms = Object.assign(defaultPermissions, permissions)
+      // this.$log.debug('Permissions: ', perms)
+      return perms
     }
   },
   watch: {
@@ -91,22 +141,36 @@ export default {
     },
     search(attrs) {
       this.$emit('TagSearch', attrs)
-      return this.dataTable.search(attrs, true)
+      return this.dataTable?.search(attrs, true)
     },
     filter(attrs) {
       this.$emit('TagFilter', attrs)
       this.$refs.dataTable.$refs.dataTable.search(attrs, true)
     },
+    hasActionPerm(action) {
+      const permRequired = this.permissions[action]
+      return this.$hasPerm(permRequired)
+    },
     handleDateChange(attrs) {
-      this.$set(this.extraQuery, 'date_from', attrs[0].toISOString())
-      this.$set(this.extraQuery, 'date_to', attrs[1].toISOString())
-      // this.extraQuery = {
-      //   date_from: attrs[0].toISOString(),
-      //   date_to: attrs[1].toISOString()
-      // }
+      let dateFrom = ''
+      let dateTo = ''
+      try {
+        dateFrom = attrs[0].toISOString()
+        dateTo = attrs[1].toISOString()
+      } catch (e) {
+        this.$log.error('Handle date change error: ', attrs)
+        dateFrom = new Date()
+        dateFrom.setDate(dateFrom.getDate() - 5)
+        dateFrom = dateFrom.toISOString()
+        dateTo = new Date()
+        dateTo.setDate(dateTo.getDate() + 1)
+        dateTo = dateTo.toISOString()
+      }
+      this.$set(this.extraQuery, 'date_from', dateFrom)
+      this.$set(this.extraQuery, 'date_to', dateTo)
       const query = {
-        date_from: attrs[0].toISOString(),
-        date_to: attrs[1].toISOString()
+        date_from: dateFrom,
+        date_to: dateTo
       }
       this.$emit('TagDateChange', attrs)
       return this.dataTable.searchDate(query)
@@ -129,6 +193,15 @@ export default {
   & >>> .el-table__header thead > tr > th {
     background-color: white;
   }
+  &>>> .el-table__row .cell {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  &>>> .el-table__expanded-cell pre {
+    max-height: 500px;
+    overflow-y: scroll;
+  }
 }
 
 //修改颜色

src/components/MFAVerifyDialog/index.vue

@@ -10,14 +10,14 @@
     v-on="$listeners"
   >
     <el-row :gutter="20">
-      <el-col :span="4">
+      <el-col :md="4" :sm="24">
         <div style="line-height: 34px;text-align: center">MFA</div>
       </el-col>
-      <el-col :span="14">
+      <el-col :md="14" :sm="24">
         <el-input v-model="MFAToken" />
         <span class="help-tips help-block">{{ $t('common.MFARequireForSecurity') }}</span>
       </el-col>
-      <el-col :span="4">
+      <el-col :md="4" :sm="24">
         <el-button size="mini" type="primary" style="line-height:20px " @click="verifyMFA">
           {{ this.$t('common.Confirm') }}
         </el-button>

src/components/RelationCard/index.vue

@@ -217,9 +217,17 @@ export default {
     async loadHasObjects() {
       this.$log.debug('Start loadHasObject: ', this.params)
       const params = this.safeMakeParams(this.params)
-      let data = await this.$axios.get(this.iAjax.url, { params: params })
+      let data = await this.$axios.get(this.iAjax.url, {
+        params: params,
+        validateStatus: (status) => {
+          if (status === 403) {
+            return 200
+          }
+          return status
+        }
+      })
       data = this.iAjax.processResults.bind(this)(data)
-      data.results.forEach((v) => {
+      data.results && data.results.forEach((v) => {
         if (!this.hasObjects.find((item) => item.value === v.value)) {
           this.iHasObjects.push(v)
         }

src/components/TableFormatters/ActionsFormatter.vue

@@ -84,15 +84,11 @@ export default {
       default: function() {
         return {
           hasUpdate: true, // can set function(row, value)
-          canUpdate: () => {
-            return !this.$store.getters.currentOrgIsRoot
-          }, // can set function(row, value)
+          canUpdate: true, // can set function(row, value)
           hasDelete: true, // can set function(row, value)
           canDelete: true,
           hasClone: true,
-          canClone: () => {
-            return !this.$store.getters.currentOrgIsRoot
-          },
+          canClone: true,
           updateRoute: this.$route.name.replace('List', 'Update'),
           cloneRoute: this.$route.name.replace('List', 'Create'),
           performDelete: defaultPerformDelete,

src/components/TableFormatters/DeleteActionFormatter.vue

@@ -1,5 +1,11 @@
 <template>
-  <el-button ref="deleteButton" size="mini" type="danger" :disabled="iDisabled" @click="onDelete(col, row, cellValue, reload)">
+  <el-button
+    ref="deleteButton"
+    size="mini"
+    type="danger"
+    :disabled="iDisabled"
+    @click="onDelete(col, row, cellValue, reload)"
+  >
     <i class="fa fa-minus" />
   </el-button>
 </template>

src/components/TableFormatters/DetailFormatter.vue

@@ -1,9 +1,10 @@
 <template>
-  <el-link class="detail" :type="col.type || 'success'" @click="goDetail">{{ iTitle }}</el-link>
+  <el-link class="detail" :disabled="disabled" :type="col.type || 'success'" @click="goDetail">{{ iTitle }}</el-link>
 </template>
 
 <script>
 import BaseFormatter from './base'
+
 export default {
   name: 'DetailFormatter',
   extends: BaseFormatter,
@@ -14,7 +15,8 @@ export default {
         return {
           route: this.$route.name.replace('List', 'Detail'),
           getRoute: null,
-          routeQuery: {},
+          routeQuery: null,
+          can: true,
           getTitle({ col, row, cellValue }) {
             return cellValue
           }
@@ -35,6 +37,13 @@ export default {
         row: this.row,
         cellValue: this.cellValue
       })
+    },
+    disabled() {
+      let can = this.formatterArgs.can
+      if (typeof can === 'function') {
+        can = can(this.col)
+      }
+      return !can
     }
   },
   methods: {
@@ -42,13 +51,17 @@ export default {
       // const defaultRoute = this.$route.name.replace('List', 'Detail')
       let route = this.formatterArgs.route
       if (this.formatterArgs.getRoute && typeof this.formatterArgs.getRoute === 'function') {
-        route = this.formatterArgs.getRoute({ row: this.row, col: this.col, cellValue: this.cellValue })
+        route = this.formatterArgs.getRoute({
+          row: this.row,
+          col: this.col,
+          cellValue: this.cellValue
+        })
       }
       if (!route) {
         console.error('No route found')
         return
       }
-      let detailRoute = {}
+      let detailRoute = { replace: true }
       if (typeof route === 'string') {
         detailRoute.name = route
         detailRoute.params = { id: this.row.id }

src/components/TableFormatters/ShowKeyCopyFormatter.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="content">
+    <span>{{ currentValue }}</span>
+    <span class="right">
+      <el-tooltip
+        effect="dark"
+        placement="top"
+        :content="this.$t('common.View')"
+      >
+        <i class="el-icon-view" @click="onShow()" />
+      </el-tooltip>
+      <el-tooltip
+        effect="dark"
+        placement="top"
+        :content="this.$t('common.Copy')"
+      >
+        <i class="el-icon-copy-document" @click="onCopy()" />
+      </el-tooltip>
+    </span>
+  </div>
+</template>
+
+<script>
+import BaseFormatter from './base'
+
+export default {
+  name: 'ShowKeyCopyFormatter',
+  extends: BaseFormatter,
+  proops: {
+    cellValue: {
+      type: String,
+      default: () => ''
+    }
+  },
+  data() {
+    return {
+      currentValue: this.switchShowValue()
+    }
+  },
+  methods: {
+    switchShowValue() {
+      return '******' + this.cellValue.replace(/[\w-]/g, '')
+    },
+    onShow() {
+      const { currentValue, cellValue, switchShowValue } = this
+      this.currentValue = currentValue === cellValue ? switchShowValue() : cellValue
+    },
+    onCopy: _.throttle(function() {
+      const inputDom = document.createElement('input')
+      inputDom.id = 'creatInputDom'
+      inputDom.value = this.cellValue
+      document.body.appendChild(inputDom)
+      inputDom.select()
+      document?.execCommand('copy')
+      this.$message({
+        message: this.$t('common.CopySuccess'),
+        type: 'success',
+        duration: 1400
+      })
+      document.body.removeChild(inputDom)
+    }, 1800)
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .content {
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    .right {
+      float: right;
+      font-size: 15px;
+      cursor: pointer;
+      .el-icon-view, .el-icon-copy-document {
+        &:hover {
+          color: #1c84c6;
+        }
+      }
+    }
+  }
+</style>

src/components/TableFormatters/TagsFormatter.vue

@@ -0,0 +1,50 @@
+<template>
+  <div>
+    <el-tag
+      v-for="tag of cellValue"
+      :key="tag"
+      :type="getTagType(tag)"
+      class="tag-formatter"
+      disable-transitions
+    >
+      <i class="fa fa-tag" /> {{ tag }}
+    </el-tag>
+  </div>
+</template>
+
+<script>
+import BaseFormatter from './base'
+export default {
+  name: 'TagsFormatter',
+  extends: BaseFormatter,
+  props: {
+    formatterArgsDefault: {
+      type: Object,
+      default() {
+        return {
+          getTagType(tag) {
+            return 'primary'
+          }
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      formatterArgs: Object.assign(this.formatterArgsDefault, this.col.formatterArgs)
+    }
+  },
+  methods: {
+    getTagType(tag) {
+      return this.formatterArgs.getTagType(tag)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+.tag-formatter {
+  margin: 2px 0;
+}
+</style>

src/components/TableFormatters/index.js

@@ -7,9 +7,11 @@ import DeleteActionFormatter from './DeleteActionFormatter'
 import DateFormatter from './DateFormatter'
 import SystemUserFormatter from './GrantedSystemUsersShowFormatter'
 import ShowKeyFormatter from '@/components/TableFormatters/ShowKeyFormatter'
+import ShowKeyCopyFormatter from './ShowKeyCopyFormatter'
 import DialogDetailFormatter from './DialogDetailFormatter'
 import EditableInputFormatter from './EditableInputFormatter'
 import StatusFormatter from './StatusFormatter'
+import TagsFormatter from './TagsFormatter'
 
 export default {
   DetailFormatter,
@@ -20,10 +22,12 @@ export default {
   DateFormatter,
   SystemUserFormatter,
   ShowKeyFormatter,
+  ShowKeyCopyFormatter,
   DialogDetailFormatter,
   ArrayFormatter,
   EditableInputFormatter,
-  StatusFormatter
+  StatusFormatter,
+  TagsFormatter
 }
 
 export {
@@ -35,8 +39,10 @@ export {
   DateFormatter,
   SystemUserFormatter,
   ShowKeyFormatter,
+  ShowKeyCopyFormatter,
   DialogDetailFormatter,
   ArrayFormatter,
   EditableInputFormatter,
-  StatusFormatter
+  StatusFormatter,
+  TagsFormatter
 }

src/components/TagSearch/index.vue

@@ -1,7 +1,13 @@
 <template>
 
   <div class="filter-field">
-    <el-cascader ref="Cascade" :options="options" :props="config" @change="handleMenuItemChange" />
+    <el-cascader
+      v-show="options.length > 0"
+      ref="Cascade"
+      :options="options"
+      :props="config"
+      @change="handleMenuItemChange"
+    />
     <el-tag
       v-for="(v, k) in filterTags"
       :key="k"
@@ -24,9 +30,11 @@
       v-model="filterValue"
       :placeholder="placeholder"
       class="search-input"
+      :class="options.length < 1 ? 'search-input2': ''"
       @blur="focus = false"
       @focus="focus = true"
       @change="handleConfirm"
+      @keyup.enter.native="handleConfirm"
     />
   </div>
 
@@ -44,6 +52,10 @@ export default {
       type: Array,
       default: () => []
     },
+    getUrlQuery: {
+      type: Boolean,
+      default: () => true
+    },
     default: {
       type: Object,
       default: null
@@ -74,7 +86,11 @@ export default {
         if (key === '') {
           key = 'search'
         }
-        data[key] = value
+        if (key.startsWith('search')) {
+          data['search'] = (data.search ? data.search + ',' : '') + value
+        } else {
+          data[key] = value
+        }
       }
       return data
     },
@@ -86,24 +102,91 @@ export default {
     }
   },
   watch: {
-    // filterTags: {
-    //   handler(val) {
-    //     this.$nextTick(() => this.$emit('tagSearch', this.filterMaps))
-    //     // this.$emit('tagSearch', this.filterMaps)
-    //   },
-    //   deep: true
-    // }
+    options: {
+      handler(val) {
+        if (val && val.length > 0) {
+          const routeFilter = this.checkInTableColumns()
+          const routerSearch = routeFilter.search || {}
+          let routerSearchAttrs = []
+          if (typeof routerSearch?.value === 'string') {
+            routerSearchAttrs = routerSearch?.value?.split(',') || []
+          }
+
+          for (const attr of routerSearchAttrs) {
+            routeFilter[`search_${attr}`] = {
+              ...routerSearch,
+              value: attr
+            }
+          }
+          if (routerSearchAttrs.length !== 0) {
+            delete routeFilter.search
+          }
+
+          const asFilterTags = _.cloneDeep(this.filterTags)
+          this.filterTags = {
+            ...asFilterTags,
+            ...routeFilter
+          }
+          if (Object.keys(routeFilter).length > 0) {
+            setTimeout(() => {
+              return this.$emit('tagSearch', this.filterMaps)
+            }, 490)
+          }
+        }
+      },
+      immediate: true,
+      deep: true
+    }
   },
   mounted() {
     setTimeout(() => {
       if (Object.keys(this.filterMaps).length > 0) {
         return this.$emit('tagSearch', this.filterMaps)
       }
-    }
-    , 400)
+    }, 400)
     // this.$nextTick(() => this.$emit('tagSearch', this.filterMaps))
   },
   methods: {
+    // 获取url中的查询条件，判断是不是包含在当前查询条件里
+    checkInTableColumns() {
+      const routeQuery = this.getUrlQuery ? this.$route?.query : {}
+      const routeQueryKeys = Object.keys(routeQuery)
+      const routeQueryKeysLength = routeQueryKeys.length
+      const keys = {}
+      if (routeQueryKeysLength < 1) {
+        return keys
+      }
+      for (const [key, value] of Object.entries(routeQuery)) {
+        let valueDecode = decodeURI(value)
+        const isSearch = key !== 'search'
+        const curOptions = this.options || []
+
+        for (let k = 0, len = curOptions.length; k < len; k++) {
+          const cur = curOptions[k]
+          if (cur?.type === 'boolean') {
+            valueDecode = !!valueDecode
+          }
+          if (key === cur.value || !isSearch) {
+            const curChildren = cur.children || []
+            keys[key] = {
+              ...cur,
+              key,
+              label: isSearch ? cur.label : '',
+              value: valueDecode
+            }
+            if (isSearch && curChildren.length > 0) {
+              for (const item of curChildren) {
+                if (valueDecode === item.value) {
+                  keys[key].valueLabel = item.label
+                  break
+                }
+              }
+            }
+          }
+        }
+      }
+      return keys
+    },
     getValueLabel(key, value) {
       for (const field of this.options) {
         if (field.value !== key) {
@@ -137,16 +220,30 @@ export default {
     },
     handleTagClose(evt) {
       this.$delete(this.filterTags, evt)
+      this.checkUrlFilds(evt)
       this.$emit('tagSearch', this.filterMaps)
       return true
     },
     handleConfirm() {
+      if (this.filterValue === '') return
       if (this.filterValue && !this.filterKey) {
-        this.filterKey = 'search'
+        this.filterKey = 'search' + '_' + this.filterValue
       }
       const tag = { key: this.filterKey, label: this.keyLabel, value: this.filterValue, valueLabel: this.valueLabel }
       this.$set(this.filterTags, this.filterKey, tag)
       this.$emit('tagSearch', this.filterMaps)
+
+      // 修改查询参数时改变url中保存的参数
+      if (this.getUrlQuery) {
+        let newQuery = _.cloneDeep(this.$route.query)
+        if (this.filterKey.startsWith('search')) {
+          newQuery = { ...newQuery, search: encodeURI(this.filterMaps.search) }
+        } else {
+          newQuery = { ...newQuery, [this.filterKey]: encodeURI(this.filterValue) }
+        }
+        this.$router.replace({ query: newQuery })
+      }
+
       this.filterKey = ''
       this.filterValue = ''
       this.valueLabel = ''
@@ -173,6 +270,19 @@ export default {
       this.filterKey = v.key
       this.filterValue = v.value
       this.$refs.SearchInput.focus()
+    },
+    // 删除查询条件时改变url
+    checkUrlFilds(evt) {
+      let newQuery = _.omit(this.$route.query, evt)
+      if (this.getUrlQuery && evt.startsWith('search')) {
+        if (newQuery.search) delete newQuery.search
+        const filterMapsSearch = this.filterMaps.search || ''
+        newQuery = {
+          ...newQuery,
+          ...(filterMapsSearch && { search: encodeURI(filterMapsSearch) })
+        }
+      }
+      this.$router.replace({ query: newQuery })
     }
   }
 }
@@ -182,10 +292,14 @@ export default {
   .filter-field {
     display: flex;
     align-items:  center;
+    min-width: 198px;
     border: 1px solid #dcdee2;
     border-radius: 3px;
     background-color:#fff;
   }
+  .search-input2 >>> .el-input__inner {
+    text-indent: 5px;
+  }
   .search-input >>> .el-input__inner {
     /*max-width:inherit !important;*/
     max-width: 200px;

src/components/TreeTable/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-collapse-transition>
     <div style="display: flex;justify-items: center; flex-wrap: nowrap;justify-content:space-between;">
-      <div v-show="iShowTree" :style="iShowTree?('width:20%;'):('width:0;')" class="transition-box">
+      <div v-show="iShowTree" :style="iShowTree?('width:20%;'):('width:0;')" class="transition-box left">
         <component
           :is="component"
           ref="AutoDataZTree"
@@ -76,6 +76,9 @@ export default {
       deep: true
     }
   },
+  mounted() {
+    // console.log(this.treeSetting)
+  },
   methods: {
     handleUrlChange(url) {
       this.$set(this.iTableConfig, 'url', url)
@@ -129,4 +132,7 @@ export default {
     overflow: auto;
     /*border-right: solid 1px red;*/
   }
+  .transition-box.left {
+    background: #f3f3f3;
+  }
 </style>

src/directive/index.js

@@ -0,0 +1 @@
+import './permission'

src/directive/permission/index.js

@@ -0,0 +1,39 @@
+import { hasPermission, getRouteRequiredPerms, getApiUrlRequirePerms } from '@/utils/jms'
+import permission from './permission'
+import Vue from 'vue'
+
+const install = function(Vue) {
+  Vue.directive('perms', permission)
+
+  Vue.prototype.$hasPerm = function(perms) {
+    return hasPermission(perms)
+  }
+
+  Vue.prototype.$hasApiActionPerm = function(url, action) {
+    const permsRequired = getApiUrlRequirePerms(url, action)
+    return hasPermission(permsRequired)
+  }
+
+  Vue.prototype.$getCurrentResActionPerms = function(action) {
+    return getRouteRequiredPerms(this.$route, action)
+  }
+
+  Vue.prototype.$hasCurrentResAction = function(action) {
+    const permsRequired = getRouteRequiredPerms(this.$route, action)
+    return hasPermission(permsRequired)
+  }
+
+  Vue.prototype.$hasLicense = function() {
+    return this.$store.getters.hasValidLicense
+  }
+
+  Vue.prototype.$isRootOrg = function() {
+    return this.$store.getters.currentOrgIsRoot
+  }
+}
+
+window['permission'] = permission
+Vue.use(install); // eslint-disable-line
+
+permission.install = install
+export default permission

src/directive/permission/permission.js

@@ -0,0 +1,18 @@
+import { hasPermission } from '@/utils/jms'
+
+function checkPermission(el, binding) {
+  const { value } = binding
+
+  if (!hasPermission(value)) {
+    el.parentNode && el.parentNode.removeChild(el)
+  }
+}
+
+export default {
+  inserted(el, binding) {
+    checkPermission(el, binding)
+  },
+  update(el, binding) {
+    checkPermission(el, binding)
+  }
+}

src/guards.js

@@ -0,0 +1,47 @@
+/* eslint-disable no-unused-vars */
+import router from './router'
+import NProgress from 'nprogress' // progress bar
+import 'nprogress/nprogress.css' // progress bar style
+import { startup } from '@/utils/startup'
+import store from '@/store'
+import { isSameView } from '@/utils/jms'
+
+NProgress.configure({
+  showSpinner: false
+}) // NProgress Configuration
+
+router.beforeEach(async(to, from, next) => {
+  // start progress bar
+  NProgress.start()
+  try {
+    await startup({ to, from, next })
+    next()
+  } catch (e) {
+    const msg = 'Start service error: ' + e
+    console.log(e)
+  }
+})
+
+function generateViewRoutesIfChange({ to, from }) {
+  const sameView = isSameView(to, from)
+  if (!sameView) {
+    return store.dispatch('permission/generateViewRoutes', { to: to, from: from })
+  }
+}
+
+function setPageTitle() {
+  const currentRoute = router.currentRoute
+  const loginTitle = store.getters.publicSettings['LOGIN_TITLE']
+  const routeTitle = currentRoute.meta.title
+  if (routeTitle) {
+    document.title = routeTitle + ' - ' + loginTitle
+  }
+}
+
+router.afterEach(async(to, from) => {
+  // finish progress bar
+  await setPageTitle()
+  await generateViewRoutesIfChange({ to, from })
+  NProgress.done()
+})
+

src/i18n/date.js

@@ -26,5 +26,19 @@ export default {
       year: 'numeric', month: 'short', day: 'numeric',
       hour: 'numeric', minute: 'numeric', hour12: true
     }
+  },
+  'ja': {
+    short: {
+      year: 'numeric', month: 'short', day: 'numeric'
+    },
+    medium: {
+      year: 'numeric', month: '2-digit', day: '2-digit',
+      hour: '2-digit', minute: '2-digit', second: '2-digit',
+      hourCycle: 'h23', hour12: false
+    },
+    long: {
+      year: 'numeric', month: 'short', day: 'numeric',
+      hour: 'numeric', minute: 'numeric', hour12: true
+    }
   }
 }

src/i18n/i18n.js

@@ -4,10 +4,15 @@ import locale from 'element-ui/lib/locale'
 import VueI18n from 'vue-i18n'
 import messages from './langs'
 import date from './date'
+import VueCookie from 'vue-cookie'
 
 Vue.use(VueI18n)
+const cookieLang = VueCookie.get('django_language')
+const browserLang = navigator.systemLanguage || navigator.language
+let lang = cookieLang || browserLang || 'zh'
+lang = lang.slice(0, 2)
 const i18n = new VueI18n({
-  locale: localStorage.lang || 'cn',
+  locale: lang,
   fallbackLocale: 'en',
   silentFallbackWarn: true,
   silentTranslationWarn: true,

src/i18n/langs/en.json

@@ -18,9 +18,9 @@
     "username_group":"Username group",
     "hostname_group":"Hostname group",
     "asset_ip_group": "Asset ip group",
-    "system_users_name_group": "Systemusers name group",
-    "system_users_protocol_group": "Systemusers protocol group",
-    "system_users_username_group": "systemusers username group",
+    "system_users_name_group": "Systemuser name",
+    "system_users_protocol_group": "Systemuser protocol",
+    "system_users_username_group": "systemuser username",
     "apply_login_asset": "Apply login asset",
     "apply_login_system_user": "Apply login system user",
     "apply_login_user": "Apply login user",
@@ -43,6 +43,9 @@
       "oracle": "Oracle",
       "postgresql": "PostgreSQL",
       "mariadb": "MariaDB",
+      "sqlserver": "SQLServer",
+      "redis": "Redis",
+      "mongodb": "MongoDB",
       "k8s": "kubernetes"
     },
     "applicationsCategory": {
@@ -82,7 +85,9 @@
     "cluster": "Cluster",
     "kubernetes":"Kubernetes",
     "clusterHelpTextMessage": "Tips: https://172.16.8.8:8443",
-    "DBInfo": "Database Info"
+    "DBInfo": "Database Info",
+    "RDBProtocol": "RDS Protocol",
+    "NoSQLProtocol": "NoSQL Protocol"
   },
   "assets": {
     "AppList": "Application list",
@@ -135,6 +140,7 @@
     "Disk": "Disk",
     "AdDomain": "AD Domain",
     "AdDomainHelpText": "AD domain provided to domain users for login",
+    "SetAdDomainNoDisabled": "If AD domain is set, it cannot be modified",
     "Domain": "Domain",
     "DomainDetail": "Domain detail",
     "DomainHelpMessage": "The domain function is added to address the fact that some environments (such as the hybrid cloud) cannot be connected directly by jumping on the gateway server.\nJMS => Domain gateway => Target assets",
@@ -155,11 +161,15 @@
     "NoInputCommand": "No input command",
     "NoSystemUserWasSelected": "No system user was selected",
     "Node": "Node",
+    "UserSwitch": "User switch",
+    "SwitchToUser": "Switch to user",
+    "SwitchToUserListTips": "When the following users are used to connect to assets, the current system user is used to log in and then switch.",
     "NodeInformation": "Node information",
     "OnlyLatestVersion": "Only latest version",
     "Os": "Os",
     "Other": "Other",
     "Password": "Password",
+    "Passphrase": "Passphrase",
     "PasswordWithoutSpecialCharHelpText": "Password can't has special chars ",
     "Pending": "Pending",
     "Platform": "Platform",
@@ -210,13 +220,16 @@
     "sshKeyFingerprint": "SSH fingerprint",
     "ip": "IP",
     "sshkey": "sshkey",
+    "SSHSecretKey": "SSh key",
     "GroupsHelpMessage": "Please fill in user groups, separated by commas if there are multiple user groups(Please fill in the existing user groups)",
     "HomeHelpMessage": "Default home directory: /home/system username",
     "Home": "Home",
     "LinuxUserAffiliateGroup": "Linux user affiliate group",
-    "ipDomain": "IP(Domain)",
+    "ipDomain": "IP(Host)",
     "HostProtocol": "Host Protocol",
     "DatabaseProtocol": "Database Protocol",
+    "RDBProtocol": "RDS Protocol",
+    "NoSQLProtocol": "NoSQL Protocol",
     "OtherProtocol": "Other Protocol",
     "PasswordOrToken": "Password / Token"
   },
@@ -226,16 +239,31 @@
     "User": "User",
     "Username": "Username",
     "SystemUserName": "System username",
-    "View": "View"
+    "View": "View",
+    "LoginIP": "Login IP",
+    "LoginCity": "Login city",
+    "LoginDate": "Login date"
   },
   "auth": {
     "LoginRequiredMsg": "You account has logout, Please login again",
     "ReLogin": "Re-Login"
   },
   "common": {
+    "PrivateCloud": "Private cloud",
+    "PublicCloud": "Public cloud",
+    "Correlation": "Correlation",
+    "UserLoginLimit": "User login limit",
+    "IPLoginLimit": "IP login limit",
+    "Setting": "Setting",
+    "Certificate": "Certificate",
+    "Scope": "Type",
+    "Builtin": "Builtin",
+    "DateCreated": "Date created",
+    "UpdatedBy": "Update by",
     "ViewMore": "View more",
     "Announcement": "Announcement",
     "Logging": "Logging",
+    "RecentLogin": "Recent login",
     "Database": "Database",
     "Params": "Params",
     "MFAVerify": "Verify MFA",
@@ -271,6 +299,7 @@
     "Close": "Close",
     "Command filter": "Command filter",
     "Comment": "Comment",
+    "Number": "Number",
     "Confirm": "Confirm",
     "Create": "Create",
     "CreatedBy": "Created by",
@@ -285,12 +314,15 @@
     "Delete": "Delete",
     "Disable": "Disable",
     "Download": "Download",
+    "Copy": "Copy",
+    "CopySuccess": "Copy success",
     "Enable": "Enable",
     "On/Off": "On/Off",
     "EnterForSearch": "Press enter to search",
     "Export": "Export",
     "Import": "Import",
     "ContinueImport": "ContinueImport",
+    "ImportAll": "Import All",
     "Continue": "Continue",
     "Stop": "Stop",
     "Finished": "Finished",
@@ -327,6 +359,7 @@
     "TestSuccessMsg": "Test Success",
     "To": "To",
     "Update": "Update",
+    "Revise": "Revise",
     "bind": "Bind",
     "unbind": "Unbind",
     "Upload": "Upload",
@@ -342,7 +375,8 @@
     "bulkDeleteSuccessMsg": "Bulk delete success",
     "bulkRemoveErrorMsg": "Bulk remove failed: ",
     "bulkRemoveSuccessMsg": "Bulk remove success",
-    "NeedAssetsAndSystemUserErrMsg": "Need assets and systemuser",
+    "SelectAtLeastOneAssetOrNodeErrMsg": "Select at least one asset or node",
+    "RequiredSystemUserErrMsg": "Required systemuser",
     "createBy": "Create by",
     "cloneFrom": "Clone from",
     "createErrorMsg": "Create error",
@@ -357,8 +391,10 @@
     "deleteFailedMsg": "Delete failed",
     "deleteSelected": "Delete selected",
     "deleteSuccessMsg": "Delete success",
+    "activateSuccessMsg": "Active success",
     "deleteWarningMsg": "Are you sure to delete ",
     "disableSelected": "Disable selected",
+    "disableSuccessMsg": "Disable success",
     "fieldRequiredError": "This field is required",
     "getErrorMsg": "Get failed",
     "fileType": "File type",
@@ -383,14 +419,22 @@
     },
     "isValid": "Is valid",
     "nav": {
+      "TempPassword": "Temporary password",
       "APIKey": "API Key",
-      "AdminPage": "Admin page",
+      "Workbench": "Workbench",
+      "Navigation": "Navigation",
+      "Console": "Console",
+      "Audits": "Audit",
+      "HomePage": "Home page",
+      "QuickAccess": "Quick access",
+      "SwitchPage": "Switch page",
       "Docs": "Docs",
       "Help": "Help",
       "Logout": "Logout",
       "Profile": "Profile",
       "Support": "Support",
       "UserPage": "User page",
+      "View": "View",
       "EnterpriseEdition": "Enterprise edition"
     },
     "passwordOrPassphrase": "Password or Passphrase",
@@ -403,6 +447,7 @@
       "Loading": "Loading"
     },
     "updateErrorMsg": "Update failed",
+    "ErrorMsg": "Error",
     "updateSelected": "Update selected",
     "updateSuccessMsg": "Update success",
     "SelectProperties": "Select properties",
@@ -416,6 +461,7 @@
       "SPECIAL_CHAR_REQUIRED": "Special char required",
       "MIN_LENGTH_ERROR": "Password minimum length {}"
     },
+    "noAnnouncement": "No announcement",
     "lastCannotBeDeleteMsg": "The last one can't be delete",
     "InvalidJson": "Not a valid json format",
     "time_period": "Time period",
@@ -455,10 +501,11 @@
       "failedConditions": "cron expression error"
     },
     "Cycle": "Cycle",
+    "FormatError": "Format error",
     "WeekCronSelect": {
       "Monday": "Monday",
       "Tuesday": "Tuesday",
-      "Wednesday": "Wednesday", 
+      "Wednesday": "Wednesday",
       "Thursday": "Thursday",
       "Friday": "Friday",
       "Saturday": "Saturday",
@@ -491,6 +538,7 @@
     "Monthly": "Monthly",
     "OnlineSessions": "Online sessions",
     "OnlineUsers": "Online users",
+    "ConnectUsers": "Connect users",
     "TimesWeekUnit": "times/week",
     "TopAssetsOfWeek": "Top assets of week",
     "TopUsersOfWeek": "Top user of week",
@@ -543,11 +591,12 @@
     "version": "Version",
     "versionDetail": "Version detail",
     "versionRunExecution": "Version run execution",
-    "Unkown": "Unkown"
+    "Unkown": "Unkown",
+    "Unknown": "Unknown"
   },
   "perms": {
     "": "",
-    "Actions": "Permission",
+    "Actions": "Actions",
     "Permission": "Permissions",
     "Asset": "Asset",
     "Basic": "Basic",
@@ -607,10 +656,25 @@
   },
   "route": {
     "": "",
+    "CreateEndpoint": "Create endpoint",
+    "UpdateEndpoint": "Update endpoint",
+    "CreateEndpointRule": "Create endpoint rule",
+    "UpdateEndpointRule": "Update endpoint rule",
+    "SystemSetting": "System setting",
+    "Index": "Index",
+    "Role": "Role",
+    "Overview": "Overview",
+    "OrgRole": "Org role",
+    "OrgRoles": "Organization roles",
+    "SystemRole": "System roles",
+    "RoleList": "Roles",
+    "RoleCreate": "Role create",
+    "RoleUpdate": "Role update",
+    "RoleDetail": "Role detail",
     "SessionDetail": "SessionDetail",
     "Accounts": "Accounts",
-    "AssetAccount": "Asset account",
-    "ApplicationAccount": "Application account",
+    "AssetAccount": "Asset Account",
+    "ApplicationAccount": "Application Account",
     "Ticket": "Tickets",
     "CommandConfirm": "Command confirm",
     "AdminUserCreate": "Admin user create",
@@ -627,9 +691,11 @@
     "AssetPermissionUpdate": "Asset permissions update",
     "AssetUpdate": "Asset update",
     "Assets": "Assets",
-    "Audits": "Audits",
+    "LogsAudits": "Logs audit",
+    "SessionsAudit": "Sessions audit",
+    "SessionList": "Session list",
     "BatchCommand": "Batch Command",
-    "BatchCommandLog": "Batch Command Log",
+    "BatchCommandLog": "Batch Command Logs",
     "CeleryTaskLog": "Celery task log",
     "CommandExecutions": "CommandExecutions ",
     "CommandFilterCreate": "Command filter create",
@@ -640,6 +706,7 @@
     "CommandFilterUpdate": "Command filter update",
     "CommandStorageUpdate": "Command storage update",
     "Commands": "Commands",
+    "FileTransfer": "File transfer",
     "CreateCommandStorage": "Create command storage",
     "CreateReplayStorage": "Create replay storage",
     "Dashboard": "Dashboard",
@@ -677,7 +744,7 @@
     "FtpLog": "FTP Logs",
     "GatewayCreate": "Gateway create",
     "GatewayUpdate": "Gateway update",
-    "JobCenter": "Jobcenter",
+    "JobCenter": "Devops",
     "LabelCreate": "Label create",
     "LabelList": "Labels",
     "LabelUpdate": "Label update",
@@ -709,6 +776,7 @@
     "Activity": "Activity",
     "SessionOffline": "Sessions offline",
     "SessionOnline": "Sessions online",
+    "RecentSession": "Recent session",
     "Sessions": "Sessions",
     "Settings": "Settings",
     "SystemUserCreate": "System user create",
@@ -727,7 +795,7 @@
     "UserFirstLogin": "UserFirstLogin",
     "UserGroupCreate": "User group create",
     "UserGroupDetail": "User group detail",
-    "UserGroupList": "User Groups",
+    "UserGroupList": "Groups",
     "UserGroupUpdate": "User group update",
     "UserGuide": "UserGuide",
     "UserList": "Users",
@@ -738,7 +806,16 @@
     "WebTerminal": "Web Terminal",
     "Notifications": "Notifications",
     "SiteMessageList": "Site message",
-    "UserLoginACL": "User Login ACL"
+    "UserLoginACL": "User Login ACL",
+    "UserLoginACLDetail": "User Login ACL",
+    "NoPermission403": "403 No permission",
+    "NoPermissionVew": "No permission view current page",
+    "AjaxError404": "404 ajax error",
+    "CannotAccess": "Unable to access the current page",
+    "GoHomePage": "Go home page"
+  },
+  "rbac": {
+    "Permissions": "Permissions"
   },
   "sessions": {
     "SetToDefaultStorage": "Set to default storage",
@@ -750,6 +827,7 @@
     "accountName": "Account name",
     "active": "active",
     "alive": "alive",
+    "noAlive": "no alive",
     "asset": "Asset",
     "target": "Target",
     "bucket": "Bucket",
@@ -805,6 +883,10 @@
     "riskLevels": {
       "common": "common"
     },
+    "SessionID": "Session ID",
+    "TargetResources": "Target resources",
+    "UseProtocol": "Use protocol",
+    "SessionState": "Session state",
     "Monitor": "Monitor",
     "XRDPNotSupport": "RDP Client session not support now",
     "sessionMonitor": "Session Monitor",
@@ -812,15 +894,15 @@
     "helpText": {
       "esUrl": "Tip: If you have multiple hosts, use comma (, ) to split (eg: http://www.jumpserver.a.com, http://www.jumpserver.b.com)",
       "esIndex":"Es provides the default index: jumpserver",
-      "esDocType": "Es provides the default document type: command",
-      "s3Endpoint": "S3: http://s3.{REGION_NAME}.amazonaws.com<br>S3(China): http://s3.{REGION_NAME}.amazonaws.com.cn<br>Example: http://s3.cn-north-1.amazonaws.com.cn",
-      "ossEndpoint": "OSS: http://{REGION_NAME}.aliyuncs.com<br>Example: http://oss-cn-hangzhou.aliyuncs.com"
+      "esDocType": "Es provides the default document type: command"
     }
   },
   "setting": {
+    "EnableKoKoSSHHelpText": "Enabled, connect assets to display SSH Client pull-up method",
+    "SettingInEndpointHelpText": "Configure the service address and port in System Settings / Terminal Settings / Service Endpoints",
     "Feature": "Feature",
     "SMSProvider": "SMS provider",
-    "SMS": "SMS setting",
+    "SMS": "SMS",
     "AlibabaCloud": "Alibaba cloud",
     "TencentCloud": "Tencent cloud",
     "VerifySignTmpl": "Verification code template",
@@ -830,13 +912,16 @@
     "SMTP": "SMTP server",
     "Setting": "Setting",
     "AuthMethod": "Auth methods",
+    "SSO": "SSO",
     "AuthLimit": "Auth limit",
     "Ops": "Task",
     "OTP": "OTP(MFA)",
-    "MessageSub": "Message subscription",
+    "MessageSub": "Message",
     "Cleaning": "Period clean",
-    "Perms": "授权",
+    "Perms": "Perms",
     "CASSetting": "CAS setting",
+    "CAS": "CAS",
+    "OIDC": "OIDC",
     "Other": "More...",
     "Auth": "Auth",
     "SyncSetting": "Sync setting",
@@ -844,26 +929,26 @@
     "InsecureCommandNotifyToSubscription": "Insecure command notification setting, change to system message subscription, support more notify method",
     "ApiKeyList": "Api key list",
     "AssetCount": "Asset count",
-    "Basic": "Basic setting",
+    "Basic": "Basic",
     "Corporation": "Corporation",
     "Create": "Create",
     "Edition": "Edition",
-    "Email": "Email setting",
+    "Email": "Email",
     "EmailContent": "Email content setting",
     "Expired": "Expired",
     "Hostname": "Hostname",
     "ImportLicense": "Import license",
     "ImportLicenseTip": "Please Import License",
-    "Ldap": "LDAP setting",
+    "Ldap": "LDAP",
     "License": "License",
     "LicenseFile": "License file",
     "PasswordCheckRule": "Password check rule",
-    "Security": "Security setting",
-    "SecuritySetting": "Security setting",
+    "Security": "Security",
+    "SecuritySetting": "Security",
     "SubscriptionID": "Subscription ID",
     "SystemMessageSubscription": "System messages",
     "insecureCommandEmailUpdate": "Setting",
-    "Terminal": "Terminal setting",
+    "Terminal": "Terminal",
     "all": "All",
     "authLdap": "Enable LDAP auth",
     "authLdapBindDn": "Bind DN",
@@ -872,7 +957,18 @@
     "authLdapSearchOu": "User OU",
     "authLdapServerUri": "LDAP server",
     "authLdapUserAttrMap": "User attr map",
-    "authCASAttrMap": "User attr map",
+    "authUserAttrMap": "User attr map",
+    "authUserAttrMapHelpText": "Mapping relationship { idp_key: sp_key}",
+    "SAML2": "SAML2",
+    "enableSAML2Auth": "Enable SAML2 Auth",
+    "SAML2Auth": "SAML2 Auth",
+    "authSAML2Xml": "IDP metadata XML",
+    "authSAML2MetadataUrl": "IDP metadata URL",
+    "IdpMetadataHelpText": "Choose one of IDP metadata URL and IDP metadata XML parameters. IDP metadata URL has high priority",
+    "IdpMetadataUrlHelpText": "Load IDP Metadata from remote url",
+    "authSAMLKeyHelpText": "SP cert and private key, using communicate with IDP",
+    "authSAMLCertHelpText": "After upload cert and private key, View SP Metadata",
+    "authSAML2AdvancedSettings": "Advanced Settings",
     "unselectedUser": "Unselected user",
     "auto": "Auto",
     "basicSetting": "Basic setting",
@@ -898,6 +994,7 @@
     "LDAPUser": "LDAP User",
     "InsecureCommandAlert": "Insecure command alert",
     "helpText": {
+      "TempPassword": "For a while, there is a period of 300 seconds, failure immediately after use",
       "ApiKeyList": "The API key is used to sign the request header. The header of each request is different. Please refer to the usage documentation",
       "authLdapSearchFilter": "Choice may be (cn|uid|sAMAccountName)=%(user)s)",
       "authLdapSearchOu": "Use | split User OUs",
@@ -973,7 +1070,7 @@
     "refreshLdapCache":"Refreshing Ldap cache ",
     "LicenseExpired": "License expired",
     "LicenseWillBe": "License will expire at ",
-    "Expire": "",
+    "Expire": "Expire",
     "WeCom": "WeCom",
     "DingTalk": "DingTalk",
     "dingTalkTest": "Test",
@@ -987,6 +1084,9 @@
     "PermissionName": "Permission name",
     "Accept": "Accept",
     "AssignedMe": "Assigned me",
+    "FlowSetUp": "Flow set up",
+    "ApprovalProcess": "Approval process",
+    "LevelApproval": "Level approval",
     "Assignee": "Assignee",
     "RequestPerm":"Request Perm",
     "AssignedInfo":"Assigned Info",
@@ -1000,7 +1100,7 @@
     "Comment": "Comment",
     "MyTickets": "My tickets",
     "action": "Action",
-    "IPGroup": "IP 组",
+    "IPGroup": "IP group",
     "Reject": "Reject",
     "date": "Date",
     "reply": "Reply",
@@ -1048,11 +1148,19 @@
     "UpdateNodeAssetHardwareInfo": "Update node asset hardware information"
   },
   "users": {
+    "InviteSuccess": "Invite success",
+    "FileEncryptionPassword": "File encryption password",
+    "OrgRoles": "Org roles",
+    "RoleUsers": "Role users",
+    "RoleInfo": "Role info",
+    "RolePerms": "Role perms",
     "MessageSubscription": "Message Subscription",
     "AuthSettings": "Auth settings",
     "UserName": "Name",
     "Account": "Account",
     "Existing":"Existing",
+    "AccountInformation": "Account information",
+    "PersonalSetting": "Personal setting",
     "Authentication": "Account",
     "Comment": "Comment",
     "ConfirmPassword": "Confirm password",
@@ -1084,7 +1192,8 @@
       "MFAOfUserFirstLoginPersonalInformationImprovementPage": "Enable multi-factor authentication to make the account more secure <br/> After is enabled, you will enter the multi-factor authentication binding process on your next login <br/> You can also bind directly in (personal information -> fast modifier -> modifier multiple factor Settings)",
       "MFAOfUserFirstLoginUserGuidePage": "To protect the security of you and the company <br/> please properly keep your account, password, key and other important and sensitive information <br/> (e.g., set a complex password and enable multi-factor authentication)",
       "SSHKeyOfProfileSSHUpdatePage": "Copy your public key here",
-      "OrgRoleHelpText": "Organizational roles are the user's role in the current organization"
+      "OrgRoleHelpText": "Organizational roles are the user's role in the current organization",
+      "addRolePermissions": "After add or update success, set permissions in detail page"
     },
     "IAgree": "I agree",
     "ImprovePersonalInformation": "Improve personal information",
@@ -1103,8 +1212,8 @@
     "ResetAndDownloadSSHKey": "Reset and download SSH Key",
     "ResetPublicKeyAndDownload": "Reset public key and download",
     "Role": "Role",
-    "SuperRole": "Super role",
-    "OrgRole": "Org role",
+    "SystemRoles": "System roles",
+    "OrgRole": "Org roles",
     "SSHKey": "SSH Key",
     "SSHKeySetting": "SSH Key setting",
     "Secure": "Secure",
@@ -1167,18 +1276,30 @@
     "HasRead": "Has read",
     "Sender": "Sender",
     "MarkAsRead": "Mark as read",
+    "OneClickRead": "Currently read",
+    "AllClickRead": "All read",
+    "OneClickReadMsg": "Are you sure you want to mark the current information as read?",
     "NoUnreadMsg": "No unread messages",
     "SiteMessage": "Site messages",
     "SMS": "SMS"
   },
   "xpack": {
+    "NavHelp": "Navigation Link",
+    "helpDocument": "Docs link",
+    "helpSupport": "Support link",
+    "helpDocumentTip": "You can change the URL of the site navigation bar help -> Docs",
+    "helpSupportTip": "You can change the URL of the site navigation bar help -> Support",
+    "officialWebsiteTip": "You can change the URL of the site navigation bar help -> Website",
     "Admin": "Admin",
     "Asset": "Asset",
+    "ip": "IP",
     "Database": "Database",
     "AssetCount": "Asset count",
     "Auditor": "Auditor",
     "ChangeAuthPlan": {
+      "MailRecipient": "Mail recipient",
       "AddAsset": "Add asset",
+      "ContainAttachment": "Contain attachment",
       "AddNode": "Add node",
       "AddSystemUser": "Add systemuser",
       "Asset": "Asset",
@@ -1219,7 +1340,12 @@
       "Name": "Name",
       "NodeAmount": "Node",
       "PasswordLength": "Password length",
+      "ChangePassword": "Change password",
+      "ModifySSHKey": "Modify SSH Key",
+      "Addressee": "Addressee",
+      "OnlyMailSend": "Currently only mail sending is supported",
       "PasswordStrategy": "Password strategy",
+      "SecretKeyStrategy": "Secret key strategy",
       "RegularlyPerform": "Regularly perform",
       "Result": "Result",
       "Retry": "Retry",
@@ -1227,19 +1353,35 @@
       "TaskList": "Task list",
       "TimeDelta": "Time delta",
       "Timer": "Timer",
+      "TimerPeriod": "Timer period",
       "Username": "Username"
     },
+    "AccountBackupPlan": {
+      "Types": "Types",
+      "Backup": "Backup",
+      "AccountBackupPlan": "Account Backup Plan",
+      "AccountBackupPlanCreate": "Account backup plan create",
+      "AccountBackupPlanUpdate": "Account backup plan update",
+      "ExecutionDetail": "Execution detail",
+      "MailRecipient": "Mail recipient",
+      "IsSuccess": "Is success",
+      "Reason": "Reason"
+    },
     "Cloud": {
+      "CloudSync": "Cloud sync",
       "ServerAccountKey": "Server Account Key",
       "IPNetworkSegment": "Ip Network Segment",
       "Aliyun": "Ali Cloud",
       "Qcloud": "Tencent Cloud",
       "QingyunPrivatecloud": "Qingyun Private Cloud",
       "HuaweiPrivatecloud": "Huawei Private Cloud",
+      "OpenStack": "OpenStack",
       "GCP": "Google Cloud Platform",
       "AWS_China": "AWS(China)",
       "AWS_Int": "AWS(International)",
       "HuaweiCloud": "Huawei Cloud",
+      "BaiduCloud": "Baidu Cloud",
+      "JDCloud": "JD Cloud",
       "Azure":"Azure(China)",
       "Azure_Int": "Azure(International)",
       "HostnameStrategy": "Used to produce the asset hostname. For example, 1. Instance name (instanceDemo)；2. Instance name and Partial IP (instanceDemo-250.1)",
@@ -1264,7 +1406,8 @@
       "Name": "Name",
       "Account":"Account",
       "Node": "Node",
-      "AdminUser":"Admin user",
+      "WindowsAdminUser":"Windows Admin user",
+      "LinuxAdminUser":"Linux Admin user",
       "PeriodicPerform":"Periodic perform",
       "Periodic":"Periodic",
       "RegularlyPerform": "Regularly perform",
@@ -1304,7 +1447,9 @@
     "InterfaceSettings": "Interface Setting",
     "License": "License",
     "LicenseDetail": "License detail",
-    "SystemMonitor": "System Monitor",
+    "ComponentMonitor": "System Monitor",
+    "Endpoint": "Endpoint",
+    "EndpointRule": "Endpoint rule",
     "ServiceRatio": "Service ratio",
     "LoadStatus":"Status",
     "NormalLoad":"Normal",
@@ -1315,7 +1460,9 @@
     "NoLicense": "No License",
     "Node": "Node",
     "Organization": {
+      "AllOrganization": "All organization",
       "OrganizationCreate": "Create organization",
+      "OrganizationLists": "Organization lists",
       "OrganizationDetail": "Org detail",
       "OrganizationList": "Organizations",
       "OrganizationUpdate": "Update org",

src/i18n/langs/index.js

@@ -1,15 +1,21 @@
 import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
 import enLocale from 'element-ui/lib/locale/lang/en'
-import zh from './cn.json'
+import jaLocale from 'element-ui/lib/locale/lang/ja'
+import zh from './zh.json'
 import en from './en.json'
+import ja from './ja.json'
 
 export default {
-  cn: {
+  zh: {
     ...zhLocale,
     ...zh
   },
   en: {
     ...enLocale,
     ...en
+  },
+  ja: {
+    ...jaLocale,
+    ...ja
   }
 }

src/i18n/langs/removeUnusedKeys.py

@@ -4,7 +4,8 @@ import json
 i18n_report_path = '/tmp/abc.json'
 lang_paths = {
     'cn': 'cn.json',
-    'en': 'en.json'
+    'en': 'en.json',
+    'ja': 'ja.json'
 }
 
 
@@ -51,5 +52,5 @@ def remove_keys(lang):
         f.write(data)
 
 
-for i in ['cn', 'en']:
+for i in ['cn', 'en', 'ja']:
     remove_keys(i)

src/i18n/langs/zh.json

@@ -48,6 +48,9 @@
       "oracle": "Oracle",
       "postgresql": "PostgreSQL",
       "mariadb": "MariaDB",
+      "sqlserver": "SQLServer",
+      "redis": "Redis",
+      "mongodb": "MongoDB",
       "k8s": "Kubernetes"
     },
     "applicationsCategory": {
@@ -87,7 +90,9 @@
     "cluster": "集群",
     "kubernetes":"Kubernetes",
     "clusterHelpTextMessage": "例如：https://172.16.8.8:8443",
-    "DBInfo": "数据库信息"
+    "DBInfo": "数据库信息",
+    "RDBProtocol": "关系型数据库",
+    "NoSQLProtocol": "非关系数据库"
   },
   "assets": {
     "AppList": "应用列表",
@@ -137,6 +142,7 @@
     "Disk": "硬盘",
     "AdDomain": "AD域名",
     "AdDomainHelpText": "提供给域用户登录的AD域名",
+    "SetAdDomainNoDisabled": "如果设置了AD域名不能修改",
     "Domain": "网域",
     "DomainDetail": "网域详情",
     "DomainHelpMessage": "网域功能是为了解决部分环境（如：混合云）无法直接连接而新增的功能，原理是通过网关服务器进行跳转登录。JMS => 网域网关 => 目标资产",
@@ -157,12 +163,16 @@
     "NoInputCommand": "未输入命令",
     "NoSystemUserWasSelected": "未选择系统用户",
     "Node": "节点",
+    "UserSwitch": "用户切换",
+    "SwitchToUser": "Su 用户",
+    "SwitchToUserListTips": "通过以下用户连接资产时，会使用当前系统用户登录再进行切换。",
     "NodeInformation": "节点信息",
     "OnlyLatestVersion": "仅最新版本",
     "Os": "操作系统",
     "Other": "其它",
     "Hardware": "硬件信息",
     "Password": "密码",
+    "Passphrase": "密钥密码",
     "PasswordWithoutSpecialCharHelpText": "不能包含特殊字符",
     "Pending": "等待",
     "Platform": "系统平台",
@@ -215,7 +225,7 @@
     "sshKeyFingerprint": "SSH 指纹",
     "ip": "IP",
     "sshkey": "sshkey",
-    "SSHKey": "SSH 密钥",
+    "SSHSecretKey": "SSH 密钥",
     "GroupsHelpMessage": "请输入用户组，多个用户组使用逗号分隔（需填写已存在的用户组）",
     "HomeHelpMessage": "默认家目录 /home/系统用户名: /home/username",
     "Home": "家目录",
@@ -223,6 +233,8 @@
     "ipDomain": "IP(域名)",
     "HostProtocol": "主机协议",
     "DatabaseProtocol": "数据库协议",
+    "RDBProtocol": "关系型数据库",
+    "NoSQLProtocol": "非关系数据库",
     "OtherProtocol": "其它协议",
     "PasswordOrToken": "密码 / 令牌"
   },
@@ -232,16 +244,32 @@
     "User": "用户",
     "Username": "用户名",
     "View": "查看",
-    "SystemUserName": "系统用户名"
+    "SystemUserName": "系统用户名",
+    "LoginIP": "登录IP",
+    "LoginCity": "登录城市",
+    "LoginDate": "登录日期"
   },
   "auth": {
     "LoginRequiredMsg": "账号已退出，请重新登录",
     "ReLogin": "重新登录"
   },
   "common": {
+    "Component": "组件",
+    "PrivateCloud": "私有云",
+    "PublicCloud": "公有云",
+    "Correlation": "关联",
+    "UserLoginLimit": "用户登录限制",
+    "IPLoginLimit": "IP 登录限制",
+    "Setting": "设置",
+    "Certificate": "证书",
+    "Scope": "类别",
+    "Builtin": "内置",
+    "DateCreated": "创建日期",
+    "UpdatedBy": "更新者",
     "ViewMore": "查看更多",
     "Announcement": "公告",
     "Logging": "日志记录",
+    "RecentLogin": "最近登录",
     "Database": "数据库记录",
     "Params": "参数",
     "BasicInfo": "基本信息",
@@ -284,6 +312,7 @@
     "Close": "关闭",
     "Command filter": "命令过滤器",
     "Comment": "备注",
+    "Number": "编号",
     "Confirm": "确认",
     "Create": "创建",
     "CreatedBy": "创建者",
@@ -298,12 +327,15 @@
     "Delete": "删除",
     "Disable": "禁用",
     "Download": "下载",
+    "Copy": "复制",
+    "CopySuccess": "复制成功",
     "Enable": "启用",
     "On/Off": "启/停",
     "EnterForSearch": "按回车进行搜索",
     "Export": "导出",
     "Import": "导入",
     "ContinueImport": "继续导入",
+    "ImportAll": "导入全部",
     "Continue": "继续",
     "Stop": "停止",
     "Finished": "完成",
@@ -323,7 +355,7 @@
     "NoData": "暂无数据",
     "Open": "打开",
     "Other": "其它",
-    "Others": "其他",
+    "Others": "其它",
     "Push": "推送",
     "QuickUpdate": "快速更新",
     "RemoveSuccessMsg": "移除成功",
@@ -338,6 +370,7 @@
     "TestSuccessMsg": "测试成功",
     "To": "至",
     "Update": "更新",
+    "Revise": "修改",
     "Upload": "上传",
     "Clone": "克隆",
     "Username": "用户名",
@@ -351,7 +384,8 @@
     "bulkDeleteErrorMsg": "批量删除失败: ",
     "bulkDeleteSuccessMsg": "批量删除成功",
     "bulkRemoveErrorMsg": "批量移除失败: ",
-    "NeedAssetsAndSystemUserErrMsg": "请先选择授权的系统用户和资产",
+    "SelectAtLeastOneAssetOrNodeErrMsg": "资产或者节点至少选择一项",
+    "RequiredSystemUserErrMsg": "请先选择系统用户",
     "bulkRemoveSuccessMsg": "批量移除成功",
     "createBy": "创建者",
     "cloneFrom": "克隆自",
@@ -367,8 +401,10 @@
     "deleteFailedMsg": "删除失败",
     "deleteSelected": "删除所选",
     "deleteSuccessMsg": "删除成功",
+    "activateSuccessMsg": "激活成功",
     "deleteWarningMsg": "你确定要删除",
     "disableSelected": "禁用所选",
+    "disableSuccessMsg": "禁用成功",
     "fieldRequiredError": "这个字段是必填项",
     "getErrorMsg": "获取失败",
     "MFAErrorMsg": "MFA错误，请检查",
@@ -396,14 +432,22 @@
     "fileType": "文件类型",
     "isValid": "有效",
     "nav": {
+      "TempPassword": "临时密码",
       "APIKey": "API Key",
-      "AdminPage": "管理页面",
+      "Workbench": "工作台",
+      "Navigation": "导航",
+      "Console": "控制台",
+      "Audits": "审计台",
+      "HomePage": "首页",
+      "QuickAccess": "快速访问",
+      "SwitchPage": "切换视图",
       "Docs": "文档",
       "Help": "帮助",
       "Logout": "退出登录",
       "Profile": "个人信息",
       "Support": "支持",
-      "UserPage": "用户页面",
+      "UserPage": "用户视图",
+      "View": "视图",
       "EnterpriseEdition": "企业版"
     },
     "passwordOrPassphrase": "密码或密钥密码",
@@ -416,6 +460,7 @@
       "Loading": "加载中"
     },
     "updateErrorMsg": "更新失败",
+    "ErrorMsg": "错误",
     "updateSelected": "更新所选",
     "updateSuccessMsg": "更新成功",
     "SelectProperties": "选择属性",
@@ -429,9 +474,11 @@
       "SPECIAL_CHAR_REQUIRED": "须包含特殊字符",
       "MIN_LENGTH_ERROR": "密码最小长度 {0} 位"
     },
+    "noAnnouncement": "暂无公告",
     "lastCannotBeDeleteMsg": "最后一项，不能被删除",
     "InvalidJson": "不是合法 JSON",
     "time_period": "时段",
+    "FormatError": "格式错误",
     "WeekCronSelect": {
       "Monday": "星期一",
       "Tuesday": "星期二",
@@ -503,6 +550,7 @@
     "Monthly": "按月",
     "OnlineSessions": "在线会话",
     "OnlineUsers": "在线用户",
+    "ConnectUsers": "连接用户",
     "TimesWeekUnit": "次/周",
     "TopAssetsOfWeek": "周资产 TOP10",
     "TopUsersOfWeek": "周用户 TOP10",
@@ -555,11 +603,12 @@
     "version": "版本",
     "versionDetail": "版本详情",
     "versionRunExecution": "执行历史",
-    "Unkown": "未知"
+    "Unkown": "未知",
+    "Unknown": "未知"
   },
   "perms": {
     "": "",
-    "Actions": "权限",
+    "Actions": "动作",
     "Asset": "资产",
     "Basic": "基本",
     "Exclude": "不包含",
@@ -606,7 +655,7 @@
     "appsList":"应用列表",
     "DatabaseAppCount": "数据库应用数量",
     "KubernetesAppCount": "Kubernetes应用数量",
-    "systemUserCount": "系统用户数量",
+    "systemUserCount": "系统用户",
     "upDownload": "上传下载",
     "uploadFile": "上传文件",
     "clipboardCopyPaste":"剪贴板复制粘贴",
@@ -618,6 +667,21 @@
   },
   "route": {
     "": "",
+    "CreateEndpoint": "创建端点",
+    "UpdateEndpoint": "更新端点",
+    "CreateEndpointRule": "创建端点规则",
+    "UpdateEndpointRule": "更新端点规则",
+    "Index": "首页",
+    "SystemSetting": "系统设置",
+    "WorkBench": "工作台",
+    "Role": "角色",
+    "Overview": "概览",
+    "RoleDetail": "角色详情",
+    "RoleList": "角色列表",
+    "RoleCreate": "创建角色",
+    "RoleUpdate": "更新角色",
+    "OrgRole": "组织角色",
+    "SystemRole": "系统角色",
     "TicketFlow": "工单流",
     "TicketFlowCreate": "创建审批流",
     "TicketFlowUpdate": "更新审批流",
@@ -642,8 +706,13 @@
     "AssetPermissionUpdate": "更新资产授权规则",
     "AssetUpdate": "更新资产",
     "Assets": "资产管理",
-    "Audits": "日志审计",
+    "SessionsAudit": "会话审计",
+    "LogsAudit": "日志审计",
+    "SessionList": "会话记录",
     "BatchCommand": "批量命令",
+    "TicketsTodo": "待办工单",
+    "TicketsDone": "已办工单",
+    "TicketsNew": "提交工单",
     "BatchCommandLog": "批量命令",
     "CeleryTaskLog": "Celery任务日志",
     "CommandExecutions": "命令执行",
@@ -655,6 +724,7 @@
     "CommandFilterUpdate": "更新命令过滤器",
     "CommandStorageUpdate": "更新命令存储",
     "Commands": "命令记录",
+    "FileTransfer": "文件传输",
     "CreateCommandStorage": "创建命令存储",
     "CreateReplayStorage": "创建录像存储",
     "Dashboard": "仪表盘",
@@ -723,6 +793,7 @@
     "Detail": "详情",
     "SessionOffline": "历史会话",
     "SessionOnline": "在线会话",
+    "RecentSession": "最近会话",
     "Sessions": "会话管理",
     "Settings": "系统设置",
     "SystemUserCreate": "创建系统用户",
@@ -736,7 +807,7 @@
     "Terminal": "终端管理",
     "TicketDetail": "工单详情",
     "TicketCreate": "创建工单",
-    "Tickets": "工单管理",
+    "Tickets": "工单列表",
     "Templates": "模版管理",
     "TemplateDetail": "模版详情",
     "TemplateCreate": "创建模版",
@@ -757,7 +828,16 @@
     "WebTerminal": "Web终端",
     "Notifications": "通知",
     "SiteMessageList": "站内信",
-    "UserLoginACL": "用户登录"
+    "UserLoginACL": "用户登录",
+    "UserLoginACLDetail": "用户登录限制",
+    "NoPermission403": "403 暂无权限",
+    "NoPermissionVew": "没有权限查看当前页面",
+    "AjaxError404": "404 请求错误",
+    "CannotAccess": "无法访问当前页面",
+    "GoHomePage": "去往首页"
+  },
+  "rbac": {
+    "Permissions": "权限"
   },
   "sessions": {
     "SetToDefaultStorage": "设置为默认存储",
@@ -769,6 +849,7 @@
     "accountName": "账户名称",
     "active": "激活中",
     "alive": "在线",
+    "noAlive": "离线",
     "asset": "资产",
     "target": "目标",
     "bucket": "桶名称",
@@ -824,6 +905,10 @@
     "riskLevels": {
       "common": "普通"
     },
+    "SessionID": "会话ID",
+    "TargetResources": "目标资源",
+    "UseProtocol": "使用协议",
+    "SessionState": "会话状态",
     "Monitor": "监控",
     "XRDPNotSupport": "RDP 客户端会话, 暂不支持监控",
     "sessionMonitor": "监控",
@@ -831,12 +916,12 @@
     "helpText": {
       "esUrl": "提示：如果有多台主机，请使用逗号 ( , ) 进行分割。（eg: http://www.jumpserver.a.com:3000,http://www.jumpserver.b.com:3000）",
       "esIndex": "es提供默认index：jumpserver",
-      "esDocType": "es默认文档类型：command",
-      "s3Endpoint": "S3 格式: http://s3.{REGION_NAME}.amazonaws.com<br>S3(China) 格式: http://s3.{REGION_NAME}.amazonaws.com.cn<br>如: http://s3.cn-north-1.amazonaws.com.cn",
-      "ossEndpoint": "OSS 格式: http://{REGION_NAME}.aliyuncs.com<br>如: http://oss-cn-hangzhou.aliyuncs.com"
+      "esDocType": "es默认文档类型：command"
     }
   },
   "setting": {
+    "EnableKoKoSSHHelpText": "开启时连接资产会显示 SSH Client 拉起方式",
+    "SettingInEndpointHelpText": "在 系统设置 / 终端设置 / 服务端点 中配置服务地址和端口",
     "Feature": "功能",
     "AlibabaCloud": "阿里云",
     "TencentCloud": "腾讯云",
@@ -853,12 +938,14 @@
     "AppAuth": "App认证",
     "OtherAuth": "其它认证",
     "Ops": "任务",
-    "OTP": "OTP(虚拟MFA)",
+    "OTP": "MFA (OTP)",
     "JMSSSO": "SSO Token 登录",
     "MessageSub": "消息订阅",
     "Cleaning": "定期清理",
     "Other": "其它设置",
     "CASSetting": "CAS 配置",
+    "CAS": "CAS",
+    "OIDC": "OIDC",
     "Auth": "认证设置",
     "SyncSetting": "同步设置",
     "Advanced": "高级设置",
@@ -894,6 +981,18 @@
     "authLdapSearchOu": "用户OU",
     "authLdapServerUri": "LDAP地址",
     "authLdapUserAttrMap": "用户属性映射",
+    "authUserAttrMap": "用户属性映射",
+    "authUserAttrMapHelpText": "映射关系 {idp：sp}",
+    "SAML2": "SAML2",
+    "enableSAML2Auth": "开启 SAML2 认证",
+    "SAML2Auth": "SAML2 认证",
+    "authSAML2Xml": "IDP metadata XML",
+    "authSAML2MetadataUrl": "IDP metadata URL",
+    "authSAML2AdvancedSettings": "高级配置",
+    "IdpMetadataHelpText": "IDP metadata URL 和 IDP metadata XML参数二选一即可，IDP metadata URL的优先级高",
+    "IdpMetadataUrlHelpText": "从远端地址中加载 IDP Metadata",
+    "authSAMLKeyHelpText": "SP 证书和密钥 是用来和 IDP 加密通信的",
+    "authSAMLCertHelpText": "上传证书密钥后保存, 然后查看 SP Metadata",
     "authCASAttrMap": "用户属性映射",
     "SignaturesAndTemplates": "Signatures and Templates",
     "unselectedUser": "没有选择用户",
@@ -922,6 +1021,7 @@
     "LDAPServerInfo": "LDAP 服务器",
     "LDAPUser": "LDAP 用户",
     "helpText": {
+      "TempPassword": "临时密码有效期为 300 秒，使用后立刻失效",
       "ApiKeyList": "使用api key签名请求头，每个请求的头部是不一样的, 请查阅使用文档",
       "authLdapSearchFilter": "可能的选项是(cn或uid或sAMAccountName=%(user)s)",
       "authLdapSearchOu": "使用|分隔各OU",
@@ -1024,6 +1124,9 @@
     "PermissionName": "授权规则名称",
     "Accept": "同意",
     "AssignedMe": "待我审批",
+    "FlowSetUp": "流程设置",
+    "ApprovalProcess": "审批流程",
+    "LevelApproval": "级审批",
     "Assignee": "处理人",
     "Assignees": "待处理人",
     "Close": "关闭",
@@ -1085,10 +1188,17 @@
     "UpdateNodeAssetHardwareInfo": "更新节点资产硬件信息"
   },
   "users": {
+    "InviteSuccess": "邀请成功",
+    "FileEncryptionPassword": "文件加密密码",
+    "RoleUsers": "授权用户",
+    "RoleInfo": "角色信息",
+    "RolePerms": "角色权限",
     "MessageSubscription": "消息订阅",
     "AuthSettings": "认证配置",
     "UserName": "姓名",
     "Account": "账户",
+    "AccountInformation": "账号信息",
+    "PersonalSetting": "个人设置",
     "Authentication": "认证",
     "Comment": "备注",
     "ConfirmPassword": "确认密码",
@@ -1119,7 +1229,8 @@
       "MFAOfUserFirstLoginPersonalInformationImprovementPage": "启用多因子认证，使账号更加安全。<br/> 启用之后您将会在下次登录时进入多因子认证绑定流程；您也可以在（个人信息->快速修改->更改多因子设置）中直接绑定！",
       "MFAOfUserFirstLoginUserGuidePage": "为了保护您和公司的安全，请妥善保管您的账户、密码和密钥等重要敏感信息；（如：设置复杂密码，并启用多因子认证）",
       "SSHKeyOfProfileSSHUpdatePage": "复制你的公钥到这里",
-      "OrgRoleHelpText": "组织角色是用户在当前组织中的角色"
+      "OrgRoleHelpText": "组织角色是用户在当前组织中的角色",
+      "addRolePermissions": "创建/更新成功后，详情中添加权限"
     },
     "IAgree": "我同意",
     "ImprovePersonalInformation": "完善个人信息",
@@ -1139,8 +1250,8 @@
     "ResetAndDownloadSSHKey": "重置并下载密钥",
     "ResetPublicKeyAndDownload": "重置并下载SSH密钥",
     "Role": "角色",
-    "SuperRole": "系统角色",
-    "OrgRole": "组织角色",
+    "SystemRoles": "系统角色",
+    "OrgRoles": "组织角色",
     "SSHKey": "SSH公钥",
     "SSHKeySetting": "SSH公钥设置",
     "Secure": "安全",
@@ -1206,18 +1317,31 @@
     "HasRead": "是否已读",
     "Sender": "发送人",
     "MarkAsRead": "标记已读",
+    "OneClickRead": "当前已读",
+    "AllClickRead": "全部已读",
+    "OneClickReadMsg": "你确定要将当前信息标记为已读吗?",
     "NoUnreadMsg": "暂无未读消息",
     "SiteMessage": "站内信",
     "SMS": "短信"
   },
   "xpack": {
+    "NavHelp": "导航栏链接",
+    "helpDocument": "文档链接",
+    "helpSupport": "支持链接",
+    "officialWebsite": "官网链接",
+    "helpDocumentTip": "可以更改网站导航栏 帮助 -> 文档 的网址",
+    "helpSupportTip": "可以更改网站导航栏 帮助 -> 支持 的网址",
+    "officialWebsiteTip": "可以更改网站导航栏 帮助 -> 官网 的网址",
     "Admin": "管理员",
     "Asset": "资产",
+    "ip": "IP",
     "Database": "数据库",
     "AssetCount": "资产数量",
     "Auditor": "审计员",
     "ChangeAuthPlan": {
+      "ContainAttachment": "含附件",
       "AddAsset": "添加资产",
+      "MailRecipient": "邮件收件人",
       "AddNode": "添加节点",
       "AddSystemUser": "添加系统用户",
       "Asset": "资产",
@@ -1260,6 +1384,10 @@
       "Name": "名称",
       "NodeAmount": "节点数量",
       "PasswordLength": "密码长度",
+      "ChangePassword": "更改密码",
+      "ModifySSHKey": "修改 SSH Key",
+      "Addressee": "收件人",
+      "OnlyMailSend": "当前只支持邮件发送",
       "PasswordStrategy": "密码策略",
       "SecretKeyStrategy": "密钥策略",
       "RegularlyPerform": "定期执行",
@@ -1272,17 +1400,32 @@
       "TimerPeriod": "定时执行周期",
       "Username": "用户名"
     },
+    "AccountBackupPlan": {
+      "Types": "类型",
+      "Backup": "备份",
+      "AccountBackupPlan": "账号备份",
+      "AccountBackupPlanCreate": "创建账号备份",
+      "AccountBackupPlanUpdate": "更新账号备份",
+      "ExecutionDetail": "执行详情",
+      "MailRecipient": "邮件收件人",
+      "IsSuccess": "是否成功",
+      "Reason": "原因"
+    },
     "Cloud": {
+      "CloudSync": "云同步",
       "ServerAccountKey": "服务账号密钥",
       "IPNetworkSegment": "IP网段",
       "Aliyun": "阿里云",
       "Qcloud": "腾讯云",
       "QingyunPrivatecloud": "青云私有云",
       "HuaweiPrivatecloud": "华为私有云",
+      "OpenStack": "OpenStack",
       "GCP": "谷歌云",
       "AWS_China": "AWS(中国)",
       "AWS_Int": "AWS(国际)",
       "HuaweiCloud": "华为云",
+      "BaiduCloud": "百度云",
+      "JDCloud": "京东云",
       "Azure":"Azure(中国)",
       "Azure_Int": "Azure(国际)",
       "HostnameStrategy": "用于生成资产主机名。例如：1. 实例名称 (instanceDemo)；2. 实例名称和部分IP(后两位) (instanceDemo-250.1)",
@@ -1307,7 +1450,8 @@
       "Name": "名称",
       "Account":"账户",
       "Node": "节点",
-      "AdminUser":"特权用户",
+      "WindowsAdminUser":"Windows 特权用户",
+      "LinuxAdminUser":"Linux 特权用户",
       "Periodic":"执行周期",
       "PeriodicPerform":"定时执行",
       "RegularlyPerform": "定期执行",
@@ -1349,7 +1493,9 @@
     "ImportLicenseTip": "请导入许可证",
     "InterfaceSettings": "界面设置",
     "License": "许可证",
-    "SystemMonitor": "系统监控",
+    "ComponentMonitor": "组件监控",
+    "Endpoint": "服务端点",
+    "EndpointRule": "端点规则",
     "ServiceRatio": "组件负载统计",
     "LoadStatus":"组件状态",
     "NormalLoad":"正常",
@@ -1361,7 +1507,9 @@
     "NoLicense": "暂无许可证",
     "Node": "节点",
     "Organization": {
+      "AllOrganization": "所有组织",
       "OrganizationCreate": "创建组织",
+      "OrganizationLists": "组织列表",
       "OrganizationDetail": "组织详情",
       "OrganizationList": "组织管理",
       "OrganizationUpdate": "更新组织",
@@ -1369,14 +1517,14 @@
       "DeleteOrgTitle": "请确保组织内的以下信息已删除",
       "DeleteOrgMsg": "用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权规则",
       "OrgRole": "组织角色",
-      "users_amount": "用户数量",
-      "groups_amount": "用户组数量",
-      "assets_amount": "资产数量",
-      "admin_users_amount": "特权用户数量",
-      "system_users_amount": "系统用户数量",
-      "applications_amount": "应用数量",
-      "asset_perms_amount": "资产授权数量",
-      "app_perms_amount": "应用授权数量",
+      "users_amount": "用户",
+      "groups_amount": "用户组",
+      "assets_amount": "资产",
+      "admin_users_amount": "特权用户",
+      "system_users_amount": "系统用户",
+      "applications_amount": "应用",
+      "asset_perms_amount": "资产授权",
+      "app_perms_amount": "应用授权",
       "CreateOrgMsg": "请去组织详情内添加用户",
       "AddOrgMembers": "添加组织成员"
     },

src/icons/svg/email-fill.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645509697274" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2361" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M867.046319 156.952658 156.952658 156.952658c-49.040926 0-88.317465 39.720653-88.317465 88.76158l-0.444115 532.570501c0 49.040926 39.720653 88.76158 88.76158 88.76158l710.09366 0c49.040926 0 88.76158-39.720653 88.76158-88.76158L955.807898 245.714238C955.808922 196.673311 916.087245 156.952658 867.046319 156.952658zM867.046319 334.476841l-355.047342 221.903949-355.047342-221.903949 0-88.76158 355.047342 221.903949 355.047342-221.903949L867.046319 334.476841z" p-id="2362"></path></svg>

src/icons/svg/email.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1644305786242" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7592" width="160" height="160"><path d="M64 186.688 512 506.688 960 186.688 960 272 512 592 64 272Z" p-id="7593"></path><path d="M0 128l0 768 1024 0L1024 128 0 128zM960 832 64 832 64 192l896 0L960 832z" p-id="7594"></path></svg>

src/icons/svg/hamburger.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1584946926481" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2735" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" p-id="2736"></path></svg>

src/icons/svg/logout.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1644392731383" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" width="660" height="660"><path d="M868 732h-70.3c-4.8 0-9.3 2.1-12.3 5.8-7 8.5-14.5 16.7-22.4 24.5-32.6 32.5-70.5 58.1-112.7 75.9-43.6 18.4-90 27.8-137.9 27.8-47.9 0-94.3-9.4-137.9-27.8-42.2-17.8-80.1-43.4-112.7-75.9-32.6-32.5-58.1-70.4-76-112.5C167.3 606.2 158 559.9 158 512s9.4-94.2 27.8-137.8c17.8-42.1 43.4-80 76-112.5s70.5-58.1 112.7-75.9c43.6-18.4 90-27.8 137.9-27.8 47.9 0 94.3 9.3 137.9 27.8 42.2 17.8 80.1 43.4 112.7 75.9 7.9 7.9 15.3 16.1 22.4 24.5 3 3.7 7.6 5.8 12.3 5.8H868c6.3 0 10.2-7 6.7-12.3C798 160.5 663.8 81.6 511.3 82 271.7 82.6 79.6 277.1 82 516.4 84.4 751.9 276.2 942 512.4 942c152.1 0 285.7-78.8 362.3-197.7 3.4-5.3-0.4-12.3-6.7-12.3z" p-id="2176"></path><path d="M956.9 505.7L815 393.7c-5.3-4.2-13-0.4-13 6.3v76H488c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h314v76c0 6.7 7.8 10.5 13 6.3l141.9-112c4.1-3.2 4.1-9.4 0-12.6z" p-id="2177"></path></svg>

src/icons/svg/setting-fill.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645523497356" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8682" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512.5 390.6c-29.9 0-57.9 11.6-79.1 32.8-21.1 21.2-32.8 49.2-32.8 79.1 0 29.9 11.7 57.9 32.8 79.1 21.2 21.1 49.2 32.8 79.1 32.8 29.9 0 57.9-11.7 79.1-32.8 21.1-21.2 32.8-49.2 32.8-79.1 0-29.9-11.7-57.9-32.8-79.1-21.2-21.2-49.2-32.8-79.1-32.8z" p-id="8683"></path><path d="M924.8 626.1l-65.4-55.9c3.1-19 4.7-38.4 4.7-57.7s-1.6-38.8-4.7-57.7l65.4-55.9c10.1-8.6 13.8-22.6 9.3-35.2l-0.9-2.6c-18.1-50.4-44.8-96.8-79.6-137.7l-1.8-2.1c-8.6-10.1-22.5-13.9-35.1-9.5l-81.2 28.9c-30-24.6-63.4-44-99.6-57.5l-15.7-84.9c-2.4-13.1-12.7-23.3-25.8-25.7l-2.7-0.5c-52-9.4-106.8-9.4-158.8 0l-2.7 0.5c-13.1 2.4-23.4 12.6-25.8 25.7l-15.8 85.3c-35.9 13.6-69.1 32.9-98.9 57.3l-81.8-29.1c-12.5-4.4-26.5-0.7-35.1 9.5l-1.8 2.1c-34.8 41.1-61.5 87.4-79.6 137.7l-0.9 2.6c-4.5 12.5-0.8 26.5 9.3 35.2l66.2 56.5c-3.1 18.8-4.6 38-4.6 57 0 19.2 1.5 38.4 4.6 57l-66 56.5c-10.1 8.6-13.8 22.6-9.3 35.2l0.9 2.6c18.1 50.3 44.8 96.8 79.6 137.7l1.8 2.1c8.6 10.1 22.5 13.9 35.1 9.5l81.8-29.1c29.8 24.5 63 43.9 98.9 57.3l15.8 85.3c2.4 13.1 12.7 23.3 25.8 25.7l2.7 0.5c26.1 4.7 52.7 7.1 79.4 7.1 26.7 0 53.4-2.4 79.4-7.1l2.7-0.5c13.1-2.4 23.4-12.6 25.8-25.7l15.7-84.9c36.2-13.6 69.6-32.9 99.6-57.5l81.2 28.9c12.5 4.4 26.5 0.7 35.1-9.5l1.8-2.1c34.8-41.1 61.5-87.4 79.6-137.7l0.9-2.6c4.3-12.4 0.6-26.3-9.5-35z m-412.3 52.2c-97.1 0-175.8-78.7-175.8-175.8s78.7-175.8 175.8-175.8 175.8 78.7 175.8 175.8-78.7 175.8-175.8 175.8z" p-id="8684"></path></svg>

src/icons/svg/setting.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645506884918" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2221" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M872.554667 306.304c-22.613333 8.128-45.696 9.941333-69.162667 4.373333a119.722667 119.722667 0 0 1-85.504-158.144c1.749333-4.842667 0.853333-6.954667-3.605333-8.96-17.92-8.106667-35.541333-16.917333-53.674667-24.533333-11.925333-4.992-24.533333-8.384-36.501333-12.373333-23.146667 47.658667-59.456 74.88-112.064 74.88-52.821333 0-89.258667-27.306667-111.978667-74.538667a411.733333 411.733333 0 0 0-95.530667 39.573333c17.216 49.493333 10.922667 94.634667-26.538666 131.925334-37.376 37.205333-82.496 43.712-131.776 26.282666A413.290667 413.290667 0 0 0 106.666667 400.298667c46.933333 22.656 74.197333 58.666667 74.517333 110.997333 0.32 53.162667-26.986667 89.770667-74.538667 112.768a410.154667 410.154667 0 0 0 39.637334 95.530667c47.808-16.789333 91.669333-11.370667 128.64 23.253333 39.957333 37.44 47.274667 83.626667 29.653333 134.933333a404.949333 404.949333 0 0 0 95.530667 39.466667c23.04-47.36 59.349333-74.474667 111.978666-74.453333 52.885333 0.064 89.216 27.541333 111.893334 74.538666a411.584 411.584 0 0 0 95.488-39.616c-17.386667-49.493333-10.816-94.4 26.24-131.626666 37.290667-37.418667 82.432-43.776 132.053333-26.538667a407.637333 407.637333 0 0 0 39.509333-95.509333c-47.786667-23.210667-74.986667-59.946667-74.517333-113.066667 0.448-52.053333 27.562667-87.957333 74.56-110.656a420.394667 420.394667 0 0 0-38.016-92.970667c-2.048-3.712-4.309333-1.92-6.762667-1.066666z m85.952 82.794667a42.666667 42.666667 0 0 1-22.613334 49.642666c-34.602667 16.725333-50.176 39.146667-50.453333 72.618667-0.298667 34.282667 15.253333 57.194667 50.496 74.304a42.666667 42.666667 0 0 1 22.549333 49.536 450.304 450.304 0 0 1-43.669333 105.472 42.666667 42.666667 0 0 1-51.050667 19.178667c-36.650667-12.736-63.850667-7.68-87.808 16.362666-23.914667 24.021333-28.949333 51.093333-16.213333 87.381334a42.666667 42.666667 0 0 1-19.072 51.178666 454.229333 454.229333 0 0 1-105.344 43.690667 42.666667 42.666667 0 0 1-49.770667-22.592c-16.725333-34.688-39.509333-50.368-73.493333-50.389333-33.92-0.021333-56.597333 15.509333-73.578667 50.432a42.666667 42.666667 0 0 1-49.322666 22.570666 447.338667 447.338667 0 0 1-105.6-43.562666 42.666667 42.666667 0 0 1-19.328-50.986667c13.034667-37.973333 7.381333-65.728-18.474667-89.941333-23.594667-22.101333-50.090667-26.517333-85.333333-14.144a42.666667 42.666667 0 0 1-51.157334-19.050667 452.821333 452.821333 0 0 1-43.733333-105.450667 42.666667 42.666667 0 0 1 22.549333-49.706666c35.072-16.938667 50.666667-39.808 50.453334-74.069334-0.213333-33.642667-15.786667-56.149333-50.389334-72.853333A42.666667 42.666667 0 0 1 65.493333 389.12a455.808 455.808 0 0 1 43.541334-105.344 42.666667 42.666667 0 0 1 51.392-19.242667c36.096 12.778667 63.317333 7.722667 87.466666-16.298666 24-23.893333 29.034667-51.072 16.32-87.68a42.666667 42.666667 0 0 1 19.178667-51.050667 454.4 454.4 0 0 1 105.386667-43.669333 42.666667 42.666667 0 0 1 49.706666 22.656c16.725333 34.730667 39.509333 50.389333 73.536 50.368 33.898667 0 56.576-15.616 73.664-50.837334a42.666667 42.666667 0 0 1 51.882667-21.845333c2.517333 0.832 4.992 1.621333 9.28 2.965333l7.530667 2.346667c8.96 2.88 15.786667 5.290667 22.698666 8.192 10.154667 4.245333 18.090667 7.872 35.029334 15.829333 10.069333 4.736 14.4 6.741333 19.733333 9.152 25.024 11.306667 35.349333 36.821333 26.154667 62.336-16 44.352 9.344 91.221333 55.253333 102.144 14.805333 3.52 29.418667 2.538667 44.864-3.029333a33.28 33.28 0 0 1 4.48-1.621333c5.269333-1.621333 10.88-2.453333 17.322667-1.941334 16.853333 1.344 29.525333 11.093333 36.736 24.170667a462.890667 462.890667 0 0 1 41.813333 102.357333zM522.666667 320a202.666667 202.666667 0 1 0 166.4 86.954667 21.333333 21.333333 0 0 0-35.008 24.384 160 160 0 1 1-69.184-56.128 21.333333 21.333333 0 0 0 16.597333-39.317334A202.090667 202.090667 0 0 0 522.666667 320z" fill="#3D3D3D" p-id="2222"></path></svg>

src/icons/svg/sitemsg.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645509489750" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1546" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1021.5936 836.5056 702.3616 480.9216 1021.0304 185.0368C1022.5152 189.3376 1023.8976 193.6896 1023.8976 198.3488L1023.8976 825.6C1023.8976 829.4912 1022.5664 832.9216 1021.5936 836.5056ZM39.168 155.1872C42.0864 154.6752 44.6464 153.5488 47.5648 153.5488L976.5376 153.5488C979.456 153.5488 982.0672 154.6752 984.9344 155.1872L512.0512 572.416 39.168 155.1872ZM2.4576 836.5568C1.536 832.9728 0.1024 829.5424 0.1024 825.6L0.1024 198.3488C0.1024 193.5872 1.5872 189.2864 3.0208 184.9856L321.8432 480.9216 2.4576 836.5568ZM496.8448 618.8032C501.248 622.336 506.6752 624.0256 512.0512 624.0256 517.4784 624.0256 522.8032 622.336 527.1552 618.8032L665.7536 509.7472 988.1088 868.1984C984.32 869.12 980.6336 870.4512 976.5376 870.4512L47.5648 870.4512C43.52 870.4512 39.8336 869.12 36.096 868.1984L358.4 509.7472 496.8448 618.8032Z" p-id="1547"></path></svg>

src/icons/svg/terminal-fill.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645509271413" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3715" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M0 128v768h1024V128H0z m242.816 577.536L192 654.72l154.304-154.368L192 346.048l50.816-50.816L448 500.352l-205.184 205.184z m584.32 13.248H512V640h315.072v78.72z" fill="#262626" p-id="3716"></path></svg>

src/icons/svg/terminal.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645509388374" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3850" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M0 64l0 896 1024 0 0-896-1024 0zM960 896l-896 0 0-768 896 0 0 768zM896 192l-768 0 0 640 768 0 0-640zM448 512l-64 0 0 64-64 0 0 64-64 0 0-64 64 0 0-64 64 0 0-64-64 0 0-64-64 0 0-64 64 0 0 64 64 0 0 64 64 0 0 64zM704 640l-192 0 0-64 192 0 0 64z" p-id="3851"></path></svg>

src/layout/components/AppMain.vue

@@ -32,7 +32,7 @@ export default {
   /*padding: 10px 20px 10px;*/
 }
 .fixed-header+.app-main {
-  padding-top: 50px;
+  padding-top: 55px;
 }
 .hasTagsView {
   .app-main {

src/layout/components/Footer/index.vue

@@ -3,8 +3,8 @@
     <div class="pull-right">
       Version <strong> dev </strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv2. </span>
     </div>
-    <div v-if="!publicSettings.XPACK_LICENSE_IS_VALID" style="padding-left:20px;">
-      <strong>Copyright</strong> FIT2CLOUD 飞致云 © 2014-2021
+    <div style="padding-left:20px;">
+      {{ publicSettings.XPACK_LICENSE_INFO.corporation }}
     </div>
   </div>
 </template>
@@ -12,6 +12,11 @@
 import { mapGetters } from 'vuex'
 export default {
   name: 'Footer',
+  data() {
+    return {
+      curYear: this.$moment().year() || ''
+    }
+  },
   computed: {
     ...mapGetters([
       'sidebar',

src/layout/components/GenericCreateUpdateForm/index.vue

@@ -51,6 +51,10 @@ export default {
       type: Function,
       default: null
     },
+    hasReset: {
+      type: Boolean,
+      default: null
+    },
     // 如何提交数据
     performSubmit: {
       type: Function,
@@ -149,12 +153,14 @@ export default {
           msgLinkName = res.hostname
         }
         const h = this.$createElement
+        const detailRoute = this.objectDetailRoute
+        detailRoute.params = { id: res.id }
         if (this.hasDetailInMsg) {
           this.$message({
             message: h('p', null, [
               h('el-link', {
                 on: {
-                  click: () => this.$router.push(this.objectDetailRoute)
+                  click: () => this.$router.push(detailRoute)
                 },
                 style: { 'vertical-align': 'top' }
               }, msgLinkName),
@@ -177,7 +183,7 @@ export default {
       default(res, method, vm, addContinue) {
         const route = this.getNextRoute(res, method)
         if (!(route.params && route.params.id)) {
-          route['params'] = { 'id': res.id }
+          route['params'] = Object.assign(route['params'] || {}, { 'id': res.id })
         }
         this.$emit('submitSuccess', res)
 
@@ -190,6 +196,7 @@ export default {
     onPerformError: {
       type: Function,
       default(error, method, vm) {
+        this.$log.error('error: ', error)
         this.$emit('submitError', error)
         const response = error.response
         const data = response.data
@@ -279,8 +286,8 @@ export default {
       let object = this.object
       if (!object || Object.keys(object).length === 0) {
         if (cloneFrom) {
-          this.$log.debug('Clone from: ', cloneFrom)
-          const url = `${this.url}${cloneFrom}/`
+          const [curUrl, query] = this.url.split('?')
+          const url = `${curUrl}${cloneFrom}/${query ? ('?' + query) : ''}`
           object = await this.getObjectDetail(url)
           if (object['name']) {
             object.name = this.$t('common.cloneFrom') + ' ' + object.name

src/layout/components/GenericDetailPage/index.vue

@@ -28,10 +28,20 @@ export default {
     ActionsGroup
   },
   props: {
+    url: {
+      type: String,
+      required: false,
+      default: ''
+    },
     object: {
       type: Object,
       required: true
     },
+    titlePrefix: {
+      type: String,
+      required: false,
+      default: ''
+    },
     title: {
       type: String,
       default: ''
@@ -61,12 +71,11 @@ export default {
     getTitle: {
       type: Function,
       default: function(obj) {
-        const objectType = this.$route.meta.title
-          .replace('Detail', '')
-          .replace('详情', '')
+        const objectType = this.$route.meta.title.replace('Detail', '').replace('详情', '')
         this.$log.debug('Object is: ', obj)
+        const titlePrefix = this.titlePrefix || objectType
         const objectName = this.getObjectName(obj)
-        let title = `${objectType}: ${objectName}`
+        let title = `${titlePrefix}: ${objectName}`
         if (title.length > 80) {
           title = title.slice(0, 80) + '...'
         }
@@ -82,20 +91,29 @@ export default {
   },
   data() {
     const vm = this
+    const detailApiUrl = (function() {
+      if (vm.url) {
+        return `${vm.url}/${vm.$route.params.id}/`
+      } else {
+        return getApiPath(vm)
+      }
+    }())
     const defaultActions = {
-      canDelete: true,
-      deleteCallback: function(item) { this.defaultDelete(item) },
-      deleteApiUrl: getApiPath(this),
+      // Delete button
+      canDelete: vm.$hasCurrentResAction('delete'),
+      deleteCallback: function(item) { vm.defaultDelete(item) },
+      deleteApiUrl: detailApiUrl,
       deleteSuccessRoute: this.$route.name.replace('Detail', 'List'),
+      // Update button
       canUpdate: () => {
-        return !vm.currentOrgIsRoot
+        return !vm.currentOrgIsRoot && vm.$hasCurrentResAction('change')
       },
       updateCallback: function(item) { this.defaultUpdate(item) },
-      updateRoute: this.$route.name.replace('Detail', 'Update'),
-      detailApiUrl: getApiPath(this)
+      updateRoute: this.$route.name.replace('Detail', 'Update')
     }
     return {
-      defaultActions: defaultActions,
+      detailApiUrl,
+      defaultActions,
       loading: true,
       validActions: Object.assign(defaultActions, this.actions)
     }
@@ -146,7 +164,7 @@ export default {
     defaultDelete() {
       const msg = this.$t('common.deleteWarningMsg') + ' ' + this.iTitle + ' ?'
       const title = this.$t('common.Info')
-      const performDelete = async function() {
+      const performDelete = () => {
         const url = this.validActions.deleteApiUrl
         this.$log.debug('Start perform delete: ', url)
         return this.$axios.delete(url)
@@ -183,7 +201,8 @@ export default {
       this.$router.push(route)
     },
     getObject() {
-      const url = this.validActions.detailApiUrl
+      // 兼容之前的 detailApiUrl
+      const url = this.validActions.detailApiUrl || this.detailApiUrl
       return this.$axios.get(url, { disableFlashErrorMsg: true }).then(data => {
         this.$emit('update:object', data)
         this.$emit('getObjectDone', data)

src/layout/components/GenericListTable/index.vue

@@ -4,23 +4,17 @@
 
 <script>
 import ListTable from '@/components/ListTable/index'
-import { mapGetters } from 'vuex'
+
 export default {
   name: 'GenericListTable',
   components: {
     ListTable
   },
   computed: {
-    ...mapGetters(['currentOrgIsRoot'])
   },
   created() {
-    const headerActions = this.$attrs['header-actions'] || {}
-    if (headerActions.canCreate === undefined && this.currentOrgIsRoot) {
-      _.set(this.$attrs, 'header-actions.canCreate', false)
-    }
-    if (headerActions.hasImport === undefined && this.currentOrgIsRoot) {
-      _.set(this.$attrs, 'header-actions.hasImport', false)
-    }
+  },
+  methods: {
   }
 }
 </script>

src/layout/components/GenericUpdateFormDialog/index.vue

@@ -7,15 +7,22 @@
     :show-cancel="false"
     :show-confirm="false"
   >
-    <el-row>
-      <el-col :span="4">
+    <el-row :gutter="20">
+      <el-col :md="4" :sm="24">
         <div class="select-prop-label">
           <label>{{ selectPropertiesLabel }}</label>
         </div>
       </el-col>
-      <el-col :span="18">
+      <el-col :md="18" :sm="24">
         <el-checkbox-group v-model="checkedFields" @change="handleCheckedFieldsChange">
-          <el-checkbox v-for="(value, name) in iFormSetting.fieldsMeta" :key="name" :checked="true" :label="name">{{ value.label }}</el-checkbox>
+          <el-checkbox
+            v-for="(value, name) in iFormSetting.fieldsMeta"
+            :key="name"
+            :checked="true"
+            :label="name"
+          >
+            {{ value.label }}
+          </el-checkbox>
         </el-checkbox-group>
       </el-col>
     </el-row>
@@ -90,10 +97,10 @@ export default {
     getDefaultFormSetting() {
       const vm = this
       return {
-        submitMethod: () => 'post',
+        submitMethod: () => 'patch',
         cleanFormValue: function(value) {
           const filterValue = {}
-          Object.keys(value).filter((key) => vm.checkedFields.includes(key)).forEach((key) => {
+          Object.keys(value).filter((key) => vm.checkedFields?.includes(key)).forEach((key) => {
             filterValue[key] = value[key]
           })
           const formValue = []

src/layout/components/NavBar/Organization.vue

@@ -1,87 +0,0 @@
-<template>
-  <transition name="sidebarLogoFade">
-    <el-select
-      v-if="needShow()"
-      :value="currentOrg.id"
-      class="org-select"
-      filterable
-      :placeholder="$t('common.Select')"
-      @change="changeOrg"
-    >
-      <template slot="prefix">
-        <i class="fa fa-bookmark" />
-      </template>
-
-      <el-option
-        v-for="item in userAdminOrgList"
-        :key="item.id"
-        :selected="item.id === currentOrg.id"
-        :label="item.name"
-        :value="item.id"
-      />
-    </el-select>
-  </transition>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import rolec from '@/utils/role'
-import orgUtil from '@/utils/org'
-export default {
-  props: {
-    isCollapse: {
-      type: Boolean,
-      default: () => {
-        return true
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'currentOrg',
-      'currentRole',
-      'userAdminOrgList'
-    ]),
-    inAdminPage() {
-      return (this.currentRole & rolec.PERM_USE) !== rolec.PERM_USE
-    }
-  },
-  methods: {
-    needShow() {
-      const hasValidLicense = this.$store.getters.hasValidLicense
-      return !this.isCollapse && this.inAdminPage && hasValidLicense
-    },
-    changeOrg(orgId) {
-      orgUtil.changeOrg(orgId)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .org-select {
-    padding: 0 10px 7px 18px;
-    transition: opacity 0s;
-  }
-
-  .org-select >>> input.el-input__inner {
-    background: none;
-    border: none;
-    color: #8095a8;
-    font-size: 13px;
-  }
-
-  .org-select >>> input.el-input__inner::placeholder {
-    opacity: 0.2;
-  }
-
-  .org-select >>> .el-input__prefix {
-    line-height: 34px;
-    /*margin: auto 5px;*/
-  }
-
-  .sidebarLogoFade-enter,
-  .sidebarLogoFade-leave-to {
-    opacity: 0;
-  }
-</style>

src/layout/components/NavBar/index.vue

@@ -1,64 +0,0 @@
-<template>
-  <div :class="{'has-logo':showLogo}">
-    <div class="nav-header">
-      <logo v-if="showLogo" :collapse="isCollapse" />
-      <Organization :is-collapse="isCollapse" />
-    </div>
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-menu
-        :default-active="activeMenu"
-        :collapse="isCollapse"
-        :background-color="variables.menuBg"
-        :text-color="variables.menuText"
-        :text-weigth="variables.menuTextWeight"
-        :unique-opened="true"
-        :active-text-color="variables.menuActiveText"
-        :collapse-transition="false"
-        mode="vertical"
-      >
-        <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" />
-      </el-menu>
-    </el-scrollbar>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Logo from './Logo'
-import SidebarItem from './SidebarItem'
-import Organization from './Organization'
-import variables from '@/styles/variables.scss'
-
-export default {
-  components: { SidebarItem, Logo, Organization },
-  computed: {
-    ...mapGetters([
-      'permission_routes',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // if set path, the sidebar will highlight the path you set
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    showLogo() {
-      return this.$store.state.settings.sidebarLogo
-    },
-    variables() {
-      return variables
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
-<style scoped>
-  .nav-header {
-    background-image: url('~@/assets/img/header-profile.png');
-  }
-</style>

src/layout/components/NavHeader/AccountDropdown.vue

@@ -1,36 +1,34 @@
 <template>
   <div class="header-tools header-profile">
-    <el-dropdown trigger="click" @command="handleClick">
+    <el-dropdown :show-timeout="50" @command="handleClick">
       <span class="el-dropdown-link">
         <el-avatar :src="avatarUrl" class="header-avatar" />
         {{ currentUser.name }}
         <i class="el-icon-arrow-down el-icon--right" />
       </span>
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item icon="el-icon-user" command="profile">{{ $t('common.nav.Profile') }}</el-dropdown-item>
-        <template v-if="currentOrgRoles.length > 1 || hasAdminOrg ">
-          <el-dropdown-item v-if="isInAdminRole " icon="el-icon-guide" command="userPage">{{ $t('common.nav.UserPage') }}</el-dropdown-item>
-          <el-dropdown-item v-else icon="el-icon-guide" command="adminPage">{{ $t('common.nav.AdminPage') }}</el-dropdown-item>
-        </template>
-        <el-dropdown-item icon="el-icon-key" command="apiKey">{{ $t('common.nav.APIKey') }}</el-dropdown-item>
-        <el-dropdown-item divided command="logout">{{ $t('common.nav.Logout') }}</el-dropdown-item>
+        <el-dropdown-item icon="el-icon-user" command="profile">
+          {{ $t('common.nav.Profile') }}
+        </el-dropdown-item>
+        <el-dropdown-item v-if="$hasPerm('authentication.view_accesskey')" icon="el-icon-key" command="apiKey">
+          {{ $t('common.nav.APIKey') }}
+        </el-dropdown-item>
+        <el-dropdown-item v-if="$store.getters.publicSettings.AUTH_TEMP_TOKEN && $hasPerm('authentication.view_temptoken')" icon="el-icon-magic-stick" command="tempPassword">
+          {{ $t('common.nav.TempPassword') }}
+        </el-dropdown-item>
+        <el-dropdown-item divided command="logout"><svg-icon icon-class="logout" style="margin-right: 4px" />
+          {{ $t('common.nav.Logout') }}
+        </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-    <ApiKey ref="api" />
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-import ApiKey from './ApiKey'
-import rolec from '@/utils/role'
-import orgUtil from '@/utils/org'
 
 export default {
   name: 'AccountDropdown',
-  components: {
-    ApiKey
-  },
   data() {
     return {
       avatarUrl: require('@/assets/img/admin.png'),
@@ -39,59 +37,26 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'currentUser',
-      'currentRole',
-      'currentOrgRoles',
-      'userAdminOrgList',
-      'currentOrgPerms'
-    ]),
-    isInAdminRole() {
-      const inAdmin = rolec.hasPerm(rolec.ADMIN_PAGE_REQUIRE_PERM_MIN, this.currentRole)
-      return inAdmin
-    },
-    hasAdminOrg() {
-      return this.userAdminOrgList.length > 0
-    },
-    adminPageRequirePerm() {
-      return rolec.PERM_SUPER | rolec.PERM_ADMIN | rolec.PERM_AUDIT
-    },
-    hasCurrentOrgAdminPagePerm() {
-      // 只有有一个权限就可以
-      return rolec.hasAdminPagePerm(this.currentOrgPerms)
-    },
-    currentOrgUsePagePerm() {
-      const userPageRequireRole = rolec.PERM_USE
-      return userPageRequireRole & this.currentOrgPerms
-    }
+      'currentUser'
+    ])
+  },
+  created() {
   },
   methods: {
     handleClick(val) {
       switch (val) {
         case 'profile':
-          this.$router.push({ name: 'UserProfile' })
-          break
-        case 'adminPage':
-          if (this.hasCurrentOrgAdminPagePerm) {
-            const currentRole = rolec.getUserInAdminPagePerm(this.currentOrgPerms)
-            this.$store.dispatch('users/setCurrentRole', currentRole)
-            window.location.href = `/ui/`
-          } else {
-            orgUtil.change2PropOrg()
-          }
-          break
-        case 'userPage':
-          if (this.currentOrgUsePagePerm) {
-            this.$store.dispatch('users/setCurrentRole', rolec.USER)
-            window.location.href = `/ui/`
-          }
+          this.$router.push('/profile')
           break
         case 'logout':
           this.logout()
           window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
           break
         case 'apiKey':
-          this.$refs.api.showApi()
+          this.$router.push('/profile/key')
           break
+        case 'tempPassword':
+          this.$router.push('/profile/temp-password')
       }
     },
     logout() {
@@ -107,4 +72,7 @@ export default {
     margin-right: 5px;
     vertical-align: middle;
   }
+  .mobile .header-avatar {
+    display: none;
+  }
 </style>

src/layout/components/NavHeader/Help.vue

@@ -1,12 +1,12 @@
 <template>
-  <el-dropdown trigger="click" @command="handleCommand">
+  <el-dropdown :show-timeout="50" @command="handleCommand">
     <span class="el-dropdown-link">
       {{ $t('common.nav.Help') }}<i class="el-icon-arrow-down el-icon--right" />
     </span>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item command="docs">{{ $t('common.nav.Docs') }}</el-dropdown-item>
       <el-dropdown-item command="support">{{ $t('common.nav.Support') }}</el-dropdown-item>
-      <el-dropdown-item command="EnterpriseEdition">{{ $t('common.nav.EnterpriseEdition') }}</el-dropdown-item>
+      <el-dropdown-item v-if="!hasLicence" command="enterprise">{{ $t('common.nav.EnterpriseEdition') }}</el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
 </template>
@@ -14,17 +14,37 @@
 <script>
 export default {
   name: 'Help',
+  data() {
+    return {
+      URLSite: {
+        HELP_DOCUMENT_URL: '',
+        HELP_SUPPORT_URL: ''
+      }
+    }
+  },
+  computed: {
+    hasLicence() {
+      return this.$store.getters.hasValidLicense
+    }
+  },
+  created() {
+    this.initHelpURL()
+  },
   methods: {
+    initHelpURL() {
+      this.URLSite.HELP_DOCUMENT_URL = this.$store.getters.publicSettings.HELP_DOCUMENT_URL
+      this.URLSite.HELP_SUPPORT_URL = this.$store.getters.publicSettings.HELP_SUPPORT_URL
+    },
     handleCommand(command) {
       switch (command) {
         case 'support':
-          window.open('http://www.jumpserver.org/support/', '_blank')
+          window.open(this.URLSite.HELP_SUPPORT_URL, '_blank')
           break
-        case 'EnterpriseEdition':
+        case 'enterprise':
           window.open('https://jumpserver.org/enterprise.html', '_blank')
           break
         default:
-          window.open('http://docs.jumpserver.org', '_blank')
+          window.open(this.URLSite.HELP_DOCUMENT_URL, '_blank')
           break
       }
     }

src/layout/components/NavHeader/Language.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dropdown trigger="click">
+  <el-dropdown>
     <span class="el-dropdown-link">
       {{ currentLang.title }}<i class="el-icon-arrow-down el-icon--right" />
     </span>
@@ -16,15 +16,20 @@ export default {
     return {
       LANG_COOKIE_NAME: 'django_language', // 后端Django需要的COOKIE KEY
       supportLanguages: [
+        {
+          title: 'English',
+          code: 'en',
+          cookieCode: 'en'
+        },
         {
           title: '中文(简体)',
           code: 'cn',
           cookieCode: 'zh-hans' // cookie code是为了让后端知道当前语言
         },
         {
-          title: 'English',
-          code: 'en',
-          cookieCode: 'en'
+          title: '日本語',
+          code: 'ja',
+          cookieCode: 'ja' // cookie code是为了让后端知道当前语言
         }
       ]
     }
@@ -58,6 +63,8 @@ export default {
     changeMomentLang() {
       if (this.currentLang.code.indexOf('en') > -1) {
         this.$moment.locale('en')
+      } else if (this.currentLang.code.indexOf('ja') > -1) {
+        this.$moment.locale('ja')
       } else {
         this.$moment.locale('zh-cn')
       }
@@ -78,9 +85,7 @@ export default {
       }
       langCode = langCode.substr(0, 2)
       langCode = langCode.replace('zh', 'cn')
-      if (langCode) {
-        return langCode
-      }
+      return langCode
     }
   }
 }

src/layout/components/NavHeader/Organization.vue

@@ -0,0 +1,190 @@
+<template>
+  <el-select
+    :value="currentOrgId"
+    class="org-select organization"
+    filterable
+    :placeholder="$t('common.Select')"
+    @change="changeOrg"
+  >
+    <template slot="prefix">
+      <i class="fa fa-sitemap icon" />
+    </template>
+
+    <el-option-group
+      v-for="group in orgGroups"
+      :key="group.label"
+      :label="group.label"
+      class="option-group"
+    >
+      <el-option
+        v-for="item in group.options"
+        :key="item.id"
+        :selected="item.id === currentOrg.id"
+        :label="item.name"
+        :value="item.id"
+        :disabled="item.disabled"
+      >
+        <span v-if="item.icon" style="float: right; font-size: 12px">
+          <i class="fa" :class="item.icon" />
+        </span>
+        <span>{{ item.name }}</span>
+      </el-option>
+    </el-option-group>
+  </el-select>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import orgUtil from '@/utils/org'
+
+export default {
+  props: {
+    isCollapse: {
+      type: Boolean,
+      default: () => {
+        return true
+      }
+    }
+  },
+  data() {
+    return {
+      orgOption: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'currentOrg',
+      'usingOrgs',
+      'currentViewRoute'
+    ]),
+    orgActionsGroup() {
+      const orgActions = {
+        label: this.$t('xpack.Organization.OrganizationList'),
+        options: [
+          {
+            id: 'create',
+            icon: 'fa-plus',
+            disabled: !this.$hasPerm('orgs.add_organization'),
+            name: this.$t('xpack.Organization.OrganizationCreate')
+          },
+          {
+            id: 'list',
+            icon: 'fa-list-ul',
+            disabled: !this.$hasPerm('orgs.view_organization'),
+            name: this.$t('xpack.Organization.OrganizationLists')
+          }
+        ]
+      }
+      const hasPerms = this.$hasPerm('orgs.view_organization | orgs.add_organization')
+      const isConsole = this.currentViewRoute.name === 'console'
+      return hasPerms && isConsole ? orgActions : {}
+    },
+    orgChoicesGroup() {
+      return {
+        label: this.$t('xpack.Organization.AllOrganization'),
+        options: this.usingOrgs
+      }
+    },
+    orgGroups() {
+      return [
+        this.orgActionsGroup,
+        this.orgChoicesGroup
+      ]
+    },
+    currentOrgId() {
+      const usingOrgIds = this.usingOrgs.map(o => o.id)
+      let currentOrgId = this.currentOrg.id
+      const find = usingOrgIds.indexOf(currentOrgId) > -1
+      if (!find) {
+        currentOrgId = null
+      }
+      return currentOrgId
+    }
+  },
+  methods: {
+    changeOrg(orgId) {
+      const org = this.usingOrgs.find(item => item.id === orgId)
+
+      switch (orgId) {
+        case 'create':
+          this.$router.push({ name: 'OrganizationCreate' })
+          break
+        case 'list':
+          this.$router.push({ name: 'OrganizationList' })
+          break
+        default:
+          orgUtil.changeOrg(org)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/styles/element-variables.scss';
+
+.org-select {
+  padding: 0 10px 0 18px;
+  line-height: 55px;
+  background-color: #293846;
+  color: white;
+  font-weight: 600;
+  font-size: 15px;
+  //border-top: solid 1px rgb(47, 64, 80);
+  ::v-deep .el-input {
+    input.el-input__inner {
+      line-height: 55px;
+      height: 55px;
+      background: none;
+      border: none;
+    }
+  }
+}
+
+.icon {
+  color: #606266;
+  cursor: pointer;
+}
+
+.organization {
+  height: 35px;
+  line-height: 35px;
+  background: #E0E0E0;
+  border-radius: 19px;
+  color: #606266;
+
+  &:after {
+    position: absolute;
+    top: 15%;
+    left: -16px;
+    content: '';
+    width: 1px;
+    height: 25px;
+    background-color: rgba(144, 147, 152, .5);
+  }
+
+  &>>> .el-input__prefix {
+    left: 8px
+  }
+
+  &>>> .el-input--prefix .el-input__inner {
+    line-height: 35px !important;
+    height: 35px !important;
+  }
+
+  &>>> .fa-sitemap {
+    padding-left: 4px;
+  }
+
+  &>>> .el-input__icon {
+    color: #606266;
+  }
+}
+
+.option-group >>> .el-select-group__title {
+  color: #909399 !important;
+  padding-left: 15px;
+  font-size: 12px;
+  line-height: 30px;
+}
+</style>

src/layout/components/NavHeader/SiteMessages.vue

@@ -1,19 +1,26 @@
 <template>
   <div>
     <el-badge :value="unreadMsgCount" :hidden="unreadMsgCount === 0" :max="99" size="mini" type="primary">
-      <a style="color: #606266 !important; width: 30px" @click="toggleDrawer">
-        <i class="el-icon-message" style="font-size: 18px" />
-      </a>
+      <el-link style="height: 100%" @click="toggleDrawer">
+        <svg-icon icon-class="email-fill" />
+      </el-link>
     </el-badge>
     <el-drawer
+      class="drawer"
       :visible.sync="show"
       :before-close="handleClose"
       :modal="false"
       :title="$t('notifications.SiteMessage')"
       custom-class="site-msg"
-      size="25%"
+      :size="width"
       @open="getMessages"
     >
+      <div slot="title">
+        <span>{{ $t('notifications.SiteMessage') }}</span>
+        <div v-if="unreadMsgCount !== 0" class="msg-list-all-read-btn" @click.stop="oneClickRead(messages)">
+          <a style="vertical-align: sub;"> {{ $t('notifications.AllClickRead') }}</a>
+        </div>
+      </div>
       <div v-if="unreadMsgCount !== 0" class="msg-list">
         <div
           v-for="msg of messages"
@@ -32,7 +39,7 @@
             <span v-if="hoverMsgId !== msg.id || msg['has_read']" class="msg-item-head-time">
               {{ formatDate(msg.date_created) }}
             </span>
-            <div v-else class="msg-item-read-btn" @click.stop="markAsRead(msg)">
+            <div v-else class="msg-item-read-btn" @click.stop="markAsRead([msg])">
               <a>{{ $t('notifications.MarkAsRead') }}</a>
             </div>
           </div>
@@ -52,7 +59,7 @@
       :title="''"
       :close-on-click-modal="false"
       :confirm-title="$t('notifications.MarkAsRead')"
-      @confirm="markAsRead(currentMsg)"
+      @confirm="markAsRead([currentMsg])"
       @cancel="cancelRead"
     >
       <div class="msg-detail">
@@ -87,6 +94,11 @@ export default {
       unreadMsgCount: 0
     }
   },
+  computed: {
+    width() {
+      return this.$store.state.app.device === 'mobile' ? '70%' : '20%'
+    }
+  },
   mounted() {
     this.enablePullMsgCount()
   },
@@ -120,9 +132,35 @@ export default {
         return this.$moment(d).fromNow()
       }
     },
-    markAsRead(msg) {
+    oneClickRead(msgs) {
+      this.$confirm(this.$t('notifications.OneClickReadMsg'), this.$t('common.Info'), {
+        type: 'warning',
+        confirmButtonClass: 'el-button--danger',
+        beforeClose: async(action, instance, done) => {
+          if (action !== 'confirm') return done()
+          this.markAsReadAll(msgs)
+          done()
+        }
+      }).catch(() => {
+        /* 取消*/
+      })
+    },
+    markAsReadAll(msgs) {
+      const url = `/api/v1/notifications/site-message/mark-as-read-all/`
+      this.$axios.patch(url, {}).then(res => {
+        this.msgDetailVisible = false
+        this.getMessages()
+      }).catch(err => {
+        this.$message(err.detail)
+      })
+    },
+    markAsRead(msgs) {
       const url = `/api/v1/notifications/site-message/mark-as-read/`
-      this.$axios.patch(url, { ids: [msg.id] }).then(res => {
+      const msgIds = []
+      for (const item of msgs) {
+        msgIds.push(item.id)
+      }
+      this.$axios.patch(url, { ids: msgIds }).then(res => {
         this.msgDetailVisible = false
         this.getMessages()
       }).catch(err => {
@@ -164,6 +202,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.drawer {
+  height: calc(100% - 40px);
+}
 .el-badge ::v-deep .el-badge__content.is-fixed{
   top:10px;
 }
@@ -178,6 +219,10 @@ export default {
     margin-bottom: 0;
     padding-top: 10px;
     font-size: 16px;
+    .msg-list-all-read-btn {
+      font-size: 12px;
+      float: right;
+    }
   }
 
   .el-drawer__body {
@@ -243,8 +288,8 @@ export default {
   overflow: hidden;
   color: #000;
   padding: 4px 0 0;
-  line-height: 21px;
-  max-height: 21px;
+  line-height: 25px;
+  max-height: 25px;
   display: -webkit-box;
   font-size: 12px;
   display: block;

src/layout/components/NavHeader/SystemSetting.vue

@@ -0,0 +1,21 @@
+<template>
+  <el-link @click="goto()">
+    <svg-icon icon-class="setting-fill" @click="goto()" />
+  </el-link>
+</template>
+
+<script>
+
+export default {
+  name: 'WebTerminal',
+  computed: {},
+  methods: {
+    goto() {
+      this.$router.push({ name: 'SystemSetting' })
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/layout/components/NavHeader/Tickets.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    <!--    <el-link class="el-link" target="_blank" @click="goToTickets">{{ $t('route.Ticket') }}</el-link>-->
     <el-badge :value="assignedTicketCount" :hidden="assignedTicketCount===0" size="mini" type="primary">
       <el-link class="el-link" target="_blank" @click="goToTickets">{{ $t('route.Ticket') }}</el-link>
     </el-badge>
@@ -33,7 +32,8 @@ export default {
       })
     },
     goToTickets() {
-      this.$router.push({ name: 'TicketList' })
+      // this.$router.push({ name: 'TicketList' })
+      this.$router.push('/tickets')
     }
   }
 }

src/layout/components/NavHeader/ViewSwitcher.vue

@@ -0,0 +1,150 @@
+<template>
+  <el-menu
+    :default-active="currentViewRoute.name"
+    class="menu-main"
+    :class="mode"
+    :mode="mode"
+    @select="handleSelectView"
+  >
+    <el-submenu
+      index="2"
+      popper-class="view-switcher"
+    >
+      <template slot="title">
+        <span class="title-label">
+          <i class="fa fa-bars" />
+          <span>{{ $t('common.nav.View') }}</span>
+        </span>
+      </template>
+      <el-menu-item
+        v-for="view of views"
+        :key="view.name"
+        :index="view.name"
+      >
+        <i v-if="mode === 'horizontal'" class="icons" :class="view.meta.icon" />
+        <span slot="title" class="icons-title">{{ view.meta.title }}</span>
+      </el-menu-item>
+    </el-submenu>
+  </el-menu>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import store from '@/store'
+
+export default {
+  name: 'ViewSwitcher',
+  props: {
+    showTitle: {
+      type: Boolean,
+      default: false
+    },
+    mode: {
+      type: String,
+      default: 'horizontal'
+    }
+  },
+  data() {
+    return {
+      showTip: true
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'currentViewRoute',
+      'viewRoutes'
+    ]),
+    views() {
+      return this.viewRoutes.filter((item) => {
+        let show = item.meta?.showNavSwitcher
+        if (typeof show === 'function') {
+          show = show()
+        }
+        return show
+      })
+    },
+    viewsMapper() {
+      const mapper = {}
+      for (const view of this.views) {
+        mapper[view.name] = view
+      }
+      return mapper
+    },
+    currentView() {
+      return this.viewsMapper[this.currentViewRoute.name]
+    }
+  },
+  methods: {
+    async handleSelectView(key, keyPath) {
+      const routeName = this.viewsMapper[key] || '/'
+      localStorage.setItem('PreView', key)
+      // Next 之前要重置 init 状态，否则这些路由守卫就不走了
+      await store.dispatch('app/reset')
+      this.$router.push(routeName)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.menu-main.el-menu {
+  background-color: transparent;
+  // margin-top: -5px;
+  ::v-deep .el-submenu .el-submenu__title {
+    height: 55px;
+    line-height: 55px;
+    border-bottom: none;
+  }
+  &.el-menu--horizontal {
+    border-bottom: none;
+  }
+  &>>> .el-icon-arrow-down {
+    font-size: 13px;
+    color: #606266;
+  }
+}
+
+.el-menu--horizontal .el-menu .el-menu-item {
+  display: inline-block!important;
+  padding: 10px 10px;
+  text-align: center;
+  height: 70px;
+  width: 70px;
+  &:hover {
+    color: inherit;
+    i {
+      color: inherit;
+    }
+  }
+  &:first-child {
+    margin-left: 20px;
+  }
+  &:last-child {
+    margin-right: 20px;
+  }
+}
+.el-submenu.is-opened {
+  background-color: transparent;
+}
+.title-label {
+  padding-left: 12px;
+  font-size: 14px;
+  vertical-align: unset;
+  color: #606266!important;
+}
+.icons {
+  display: block;
+  font-size: 23px;
+  text-align: center;
+}
+.icons-title {
+  display: inline-block;
+  font-size: 14px;
+}
+.el-menu-item.is-active {
+  font-weight: bold;
+}
+.menu-main.mobile-view-switch >>> .el-submenu__icon-arrow {
+  right: 10px;
+}
+</style>

src/layout/components/NavHeader/WebTerminal.vue

@@ -1,5 +1,7 @@
 <template>
-  <el-link class="el-link" :href="webTerminalUrl" target="_blank">{{ $t('route.WebTerminal') }}</el-link>
+  <el-link :href="webTerminalUrl" target="_blank">
+    <svg-icon icon-class="terminal" />
+  </el-link>
 </template>
 
 <script>
@@ -16,9 +18,4 @@ export default {
 </script>
 
 <style scoped>
-.el-link {
-  color: #606266 !important;
-  font-size: 13px;
-  font-weight: 400
-}
 </style>

src/layout/components/NavHeader/index.vue

@@ -1,28 +1,40 @@
 <template>
   <div class="navbar">
-    <div class="navbar-header">
-      <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-    </div>
     <ul class="navbar-right">
       <li class="header-item header-icon">
-        <SiteMessages />
+        <el-tooltip effect="dark" :content="this.$t('route.SiteMessageList')">
+          <SiteMessages />
+        </el-tooltip>
       </li>
-      <li class="header-item" style="margin-left: 10px">
-        <Help />
+      <li v-perms="['rbac.view_webterminal']" class="header-item header-icon">
+        <el-tooltip effect="dark" :content="this.$t('route.WebTerminal')">
+          <WebTerminal />
+        </el-tooltip>
       </li>
-      <li class="header-item">
-        <Language />
+      <li v-perms="'settings.view_setting'" class="header-item header-icon">
+        <el-tooltip effect="dark" :content="this.$t('route.SystemSetting')">
+          <SystemSetting />
+        </el-tooltip>
       </li>
-      <li v-if="showTickets" class="header-item">
+      <li v-if="this.$hasLicense() && this.$hasPerm('tickets.view_ticket')" class="header-item header-hover">
         <Tickets />
       </li>
-      <li class="header-item">
-        <WebTerminal />
+      <li class="header-item active-menu">
+        <Help />
       </li>
       <li class="header-item header-profile">
         <AccountDropdown />
       </li>
     </ul>
+    <hamburger :is-active="sidebar.opened" class="hamburger-container is-show-menu" @toggleClick="toggleSideBar" />
+    <ul class="navbar-left">
+      <li class="left-item">
+        <ViewSwitcher />
+      </li>
+      <li v-if="showOrganize()" class="left-item" style="margin-left: 12px">
+        <Organization class="organization" />
+      </li>
+    </ul>
   </div>
 </template>
 
@@ -32,21 +44,23 @@ import Hamburger from '@/components/Hamburger'
 import AccountDropdown from './AccountDropdown'
 import SiteMessages from './SiteMessages'
 import Help from './Help'
-import Language from './Language'
 import WebTerminal from './WebTerminal'
 import Tickets from './Tickets'
-import rolc from '@/utils/role'
+import ViewSwitcher from './ViewSwitcher'
+import Organization from './Organization'
+import SystemSetting from './SystemSetting'
 
 export default {
   components: {
-    // Breadcrumb,
     Hamburger,
+    ViewSwitcher,
+    Organization,
     AccountDropdown,
-    Language,
     Help,
     Tickets,
     WebTerminal,
-    SiteMessages
+    SiteMessages,
+    SystemSetting
   },
   data() {
     return {
@@ -54,71 +68,112 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'sidebar', 'publicSettings', 'currentOrgRoles'
-    ]),
-    isOrgAuditor() {
-      return rolc.getRolesDisplay(this.currentOrgRoles).includes('OrgAuditor') || rolc.getRolesDisplay(this.currentOrgRoles).includes('Auditor')
-    },
-    showTickets() {
-      return this.publicSettings.TICKETS_ENABLED &&
-        this.publicSettings['XPACK_LICENSE_IS_VALID']
-    }
+      'sidebar', 'publicSettings', 'currentOrgRoles', 'currentViewRoute'
+    ])
   },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
+    },
+    showOrganize() {
+      return (this.$route.meta?.showOrganization !== false) && this.$hasLicense()
     }
   }
 }
 </script>
 <style lang="scss" scoped>
   .navbar {
-    height: 50px;
-    overflow: hidden;
     position: relative;
+    height: 55px;
+    overflow: hidden;
     background: #f3f3f4;
-    box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
-
-    .hamburger-container {
-      line-height: 46px;
-      height: 100%;
+    .navbar-left {
       float: left;
-      cursor: pointer;
-      transition: background .3s;
-      -webkit-tap-highlight-color: transparent;
-      padding-left: 20px;
+      .left-item {
+        line-height: 55px;
+        display: inline-block;
+        vertical-align: middle;
+        &>>> .el-submenu__title {
+          font-family: "open sans","Helvetica Neue",Helvetica,Arial,sans-serif;
+          padding: 0 14px;
+        }
+        &>>> .org-select {
+          padding: 0;
+        }
+      }
     }
-
     .navbar-right {
       float: right;
       margin-right: 10px;
 
-      .header-item {
-        line-height: 50px;
-        display: inline-block;
-        padding-right: 10px;
-        padding-left: 10px;
-      }
-
-      .header-icon {
+      .header-hover {
         &:hover {
           background-color: #e6e6e6;
         }
       }
+
+      .header-item {
+        line-height: 55px;
+        display: inline-block;
+        padding-right: 10px;
+        padding-left: 10px;
+        vertical-align: middle;
+      }
+
+      .header-icon {
+        padding-left: 8px;
+        padding-right: 8px;
+        &:hover {
+          background-color: #e6e6e6;
+        }
+        &>>> i {
+          color: #7c7e7f;
+          font-size: 16px;
+        }
+        &>>> .svg-icon {
+          color: #7c7e7f;
+          font-size: 16px;
+        }
+      }
     }
-
-    .breadcrumb-container {
-      float: left;
-      padding-left: 20px;
-    }
-
   }
-  .el-header {
-    background-color: #ffffff;
-  }
-
   ul {
     margin: 0;
+    padding-inline-start: 0;
+  }
+  .is-show-menu {
+    display: none;
+  }
+  .hamburger-container {
+    float: left;
+    height: 26px;
+    margin: 12px;
+    padding: 0 10px!important;
+    line-height: 30px;
+    border-radius: 4px;
+    border-color: #1ab394;
+    background-color: #1ab394;
+    color: #fff;
+    cursor: pointer;
+    transition: .2s;
+    -webkit-tap-highlight-color: transparent;
+    &>>> .svg-icon {
+      font-size: 16px;
+      color: #fff;
+    }
+  }
+  @media screen and (max-width: 1006px) {
+    .is-show-menu {
+      display: block;
+    }
+    .navbar-left {
+      display: none;
+    }
+  }
+  @media screen and (max-width: 480px){
+    .active-menu {
+      display: none!important;;
+    }
   }
 </style>
 

src/layout/components/NavLeft/Logo.vue

@@ -2,10 +2,10 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img :src="logoSrc" class="sidebar-logo">
+        <img :src="logoSrc" class="sidebar-logo" alt="logo">
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img :src="logoTextSrc" class="sidebar-logo-text">
+        <img :src="logoTextSrc" class="sidebar-logo-text" alt="logo">
       </router-link>
     </transition>
   </div>
@@ -55,8 +55,8 @@ export default {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 70px;
-  line-height: 60px;
+  height: 55px;
+  line-height: 55px;
   // background: #2b2f3a;
   text-align: center;
   overflow: hidden;
@@ -92,10 +92,10 @@ export default {
   }
 
   &.collapse {
-    height: 50px;
-    line-height: 50px;
+    height: 55px;
+    line-height: 55px;
     .sidebar-logo {
-      margin-right: 0px;
+      margin-right: 0;
     }
   }
 }

src/layout/components/NavLeft/SidebarItem.vue

@@ -1,6 +1,10 @@
 <template>
-  <div v-if="!item.hidden">
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
+  <div v-if="!item.hidden && (item.alwaysShow || !allChildrenHidden(item))">
+    <template
+      v-if="hasOneShowingChild(item.children, item) &&
+        (!onlyOneChild.children || onlyOneChild.noShowingChildren) &&
+        !item.alwaysShow"
+    >
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
           <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
@@ -57,6 +61,17 @@ export default {
     return {}
   },
   methods: {
+    allChildrenHidden(item) {
+      if (!item.children) {
+        return false
+      }
+      for (const child of item.children) {
+        if (!this.allChildrenHidden(child)) {
+          return false
+        }
+      }
+      return true
+    },
     hasOneShowingChild(children = [], parent) {
       const showingChildren = children.filter(item => {
         if (item.hidden) {

src/layout/components/NavLeft/index.vue

@@ -0,0 +1,186 @@
+<template>
+  <div :class="{'has-logo': showLogo, 'show-orgs': showOrgs}">
+    <div class="nav-header">
+      <div class="nav-logo">
+        <Logo v-if="showLogo" :collapse="isCollapse" />
+      </div>
+      <div class="active-mobile">
+        <ViewSwitcher mode="vertical" class="mobile-view-switch" />
+        <Organization class="organization" />
+      </div>
+      <div class="nav-title" :class="{'collapsed': isCollapse}">
+        {{ isTitle }}
+      </div>
+    </div>
+    <el-scrollbar wrap-class="scrollbar-wrapper">
+      <el-menu
+        class="left-menu"
+        :default-active="activeMenu"
+        :collapse="isCollapse"
+        :background-color="variables['menuBg']"
+        :text-color="variables['menuText']"
+        :text-weigth="variables['menuTextWeight']"
+        :active-text-color="variables['menuActiveText']"
+        :unique-opened="true"
+        :collapse-transition="false"
+        mode="vertical"
+      >
+        <sidebar-item
+          v-for="route in currentViewRoute.children"
+          :key="route.path"
+          :item="route"
+          :base-path="route.path"
+        />
+      </el-menu>
+    </el-scrollbar>
+    <div class="nav-footer">
+      <div class="toggle-bar">
+        <Hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import Logo from './Logo'
+import SidebarItem from './SidebarItem'
+import variables from '@/styles/variables.scss'
+import Hamburger from '@/components/Hamburger'
+import ViewSwitcher from '../NavHeader/ViewSwitcher'
+import Organization from '../NavHeader/Organization'
+
+export default {
+  components: {
+    SidebarItem,
+    Logo,
+    Hamburger,
+    ViewSwitcher,
+    Organization
+  },
+  computed: {
+    ...mapGetters([
+      'currentViewRoute',
+      'sidebar'
+    ]),
+    activeMenu() {
+      const route = this.$route
+      const { meta, path } = route
+      // if set path, the sidebar will highlight the path you set
+      if (!meta.activeMenu && !meta.hidden) {
+        return path
+      }
+      if (meta.activeMenu) {
+        return meta.activeMenu
+      }
+      const { location } = this.$router.resolve('_Mark_')
+      let locPath = location.path.replace('_Mark_', '')
+      const parmaId = location.params?.id || route.params?.id
+      if (parmaId) {
+        locPath = locPath.replace('/' + parmaId, '')
+      }
+      if (locPath.endsWith('/')) {
+        locPath = locPath.slice(0, locPath.length - 1)
+      }
+      this.$log.debug('Active menu path3: ', locPath)
+      return locPath
+    },
+    showLogo() {
+      return this.$store.state.settings.sidebarLogo
+    },
+    showOrgs() {
+      return this.$store.getters.hasValidLicense
+      // return !this.isCollapse && this.inAdminPage && hasValidLicense
+    },
+    variables() {
+      return variables
+    },
+    isCollapse() {
+      return !this.sidebar.opened
+    },
+    isTitle() {
+      return this.currentViewRoute.meta?.title || ''
+    }
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('app/toggleSideBar')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .nav-header {
+    background-image: url('~@/assets/img/header-profile.png');
+  }
+
+  .nav-logo {
+    height: 55px;
+  }
+
+  .nav-title {
+    box-sizing: border-box;
+    height: 55px;
+    padding: 17px 0 17px 22px;
+    font-size: 15px;
+    font-weight: 460;
+    color: #fff;
+    //background: #293846;
+  }
+
+  .collapsed {
+    padding: 6px 12px!important;
+  }
+
+  .organizations {
+    height: 55px;
+  }
+
+  .nav-footer {
+    display: block;
+    width: 100%;
+    height: 40px;
+    background-color: #293846;
+
+    .toggle-bar {
+      width: 55px;
+      height: 40px;
+      bottom: 0;
+      left: 0;
+      top: auto;
+      border: 0;
+      z-index: 1000;
+      position: relative;
+      cursor: pointer;
+    }
+
+    .toggle-bar:hover {
+      background-color: rgb(59, 76, 91);
+    }
+
+    .hamburger-container {
+      left: 2px;
+      top: 10px;
+      position: absolute;
+    }
+  }
+  .active-mobile {
+    display: none;
+    &>>> .organization {
+      padding-left: 8px;
+      background: transparent;
+      color: #fff;
+    }
+    &>>> .menu-main {
+      margin-left: -10px;
+    }
+    &>>> .title-label {
+      color: white !important;
+    }
+  }
+  @media screen and (max-width: 992px) {
+    .active-mobile {
+      display: block;
+    }
+  }
+</style>

src/layout/components/Page/PageHeading.vue

@@ -41,7 +41,7 @@ export default {
 <style scoped>
   .page-heading {
     border-top: 0;
-    padding: 15px 30px 15px 25px;
+    padding: 12px 30px 13px 25px;
     background-color: #ffffff;
     min-height: 1px;
   }

src/layout/components/Page/PasswordExpireTip.vue

@@ -7,7 +7,6 @@
 </template>
 
 <script>
-import { toSafeLocalDateStr } from '@/utils/common'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -41,10 +40,10 @@ export default {
   },
   methods: {
     getIntervalDays(date) {
-      const dateExpired = new Date(toSafeLocalDateStr(date))
-      const dateNow = new Date()
-      const intervalTime = dateNow.getTime() - dateExpired.getTime()
-      return Math.floor(intervalTime / (24 * 3600 * 1000))
+      const dateExpired = this.$moment(date, 'YYYY-MM-DD').format('YYYY-MM-DD')
+      const dateNow = this.$moment(new Date()).format('YYYY-MM-DD')
+      const intervalTime = this.$moment(dateNow).diff(this.$moment(dateExpired), 'days')
+      return intervalTime
     }
   }
 }

src/layout/components/Page/index.vue

@@ -1,13 +1,15 @@
 <template>
   <div class="page">
-    <PageHeading class="disabled-when-print">
+    <PageHeading v-if="iTitle || helpMessage" class="disabled-when-print">
       <slot name="title">{{ iTitle }}</slot>
       <template #rightSide>
         <slot name="headingRightSide" />
       </template>
     </PageHeading>
     <PageContent>
-      <el-alert v-if="helpMessage" type="success"> <span v-html="helpMessage" /> </el-alert>
+      <el-alert v-if="helpMessage" type="success">
+        <span class="announcement-main" v-html="helpMessage" />
+      </el-alert>
       <slot />
     </PageContent>
   </div>
@@ -34,7 +36,6 @@ export default {
   },
   computed: {
     iTitle() {
-      // return ''
       return this.title || this.$route.meta.title
     }
   }
@@ -52,5 +53,9 @@ export default {
   .print-margin{
     margin-top: 10px;
   }
+  .announcement-main {
+    word-wrap:break-word;
+    white-space: pre-wrap;
+  }
 }
 </style>

src/layout/components/TabPage/index.vue

@@ -9,15 +9,14 @@
 
     <div>
       <el-tabs
-        v-if="submenu.length > 0"
+        v-if="tabIndices.length > 0"
         slot="submenu"
         v-model="iActiveMenu"
         class="page-submenu"
         @tab-click="handleTabClick"
       >
-        <template v-for="item in submenu">
+        <template v-for="item in tabIndices">
           <el-tab-pane
-            v-if="checkShow(item)"
             :key="item.name"
             :label-content="item.labelContent"
             :name="item.name"
@@ -31,8 +30,12 @@
           </el-tab-pane>
         </template>
       </el-tabs>
-      <transition name="fade-transform" mode="out-in">
-        <slot />
+      <transition name="fade-transform" mode="out-in" appear>
+        <slot>
+          <keep-alive>
+            <component :is="computeActiveComponent" />
+          </keep-alive>
+        </slot>
       </transition>
     </div>
   </Page>
@@ -69,24 +72,30 @@ export default {
       }
     },
     tabIndices() {
-      const map = {}
-      this.submenu.forEach((v, i) => {
-        map[v.name] = i
+      const map = []
+      this.submenu.forEach((v) => {
+        const hidden = typeof v.hidden === 'function' ? v.hidden() : v.hidden
+        if (!hidden) {
+          map.push(v)
+        }
       })
       return map
+    },
+    computeActiveComponent() {
+      let needActiveComponent = ''
+      for (const i of this.submenu) {
+        if (i.component && (i.name === this.iActiveMenu)) {
+          needActiveComponent = i.component
+          break
+        }
+      }
+      return needActiveComponent
     }
   },
-  mounted() {
+  created() {
     this.iActiveMenu = this.getPropActiveTab()
   },
   methods: {
-    checkShow(item) {
-      let hidden = item.hidden
-      if (typeof hidden === 'function') {
-        hidden = hidden()
-      }
-      return !hidden
-    },
     handleTabClick(tab) {
       this.$emit('tab-click', tab)
       this.$emit('update:activeMenu', tab.name)
@@ -108,14 +117,16 @@ export default {
       ]
 
       for (const preTab of preActiveTabs) {
-        for (const tabName in this.tabIndices) {
-          if (preTab && tabName && preTab.toLowerCase() === tabName.toLowerCase()) {
-            return tabName
+        const currentTab = typeof preTab === 'object' ? preTab?.name : preTab
+        for (const tabName of this.tabIndices) {
+          const currentTabName = tabName?.name || ''
+          if (currentTab?.toLowerCase() === currentTabName?.toLowerCase()) {
+            return currentTabName
           }
         }
       }
 
-      activeTab = this.submenu[0].name
+      activeTab = this.tabIndices[0].name
       return activeTab
     }
   }

src/layout/components/index.js

@@ -1,13 +1,13 @@
-export { default as NavBar } from './NavBar'
+export { default as NavLeft } from './NavLeft'
 export { default as NavHeader } from './NavHeader'
 export { default as AppMain } from './AppMain'
 export { default as Page } from './Page'
 export { default as TagsView } from './TagsView'
-export { default as GenericDetailPage } from './GenericDetailPage'
 export { default as TabPage } from './TabPage'
 export { default as Footer } from './Footer'
 export { default as GenericListPage } from './GenericListPage'
 export { default as GenericListTable } from './GenericListTable'
+export { default as GenericDetailPage } from './GenericDetailPage'
 export { default as GenericCreateUpdatePage } from './GenericCreateUpdatePage'
 export { default as GenericCreateUpdateForm } from './GenericCreateUpdateForm'
 export { default as GenericUpdateFormDialog } from './GenericUpdateFormDialog'