+
diff --git a/apps/vben5/apps/app-antd/src/views/_core/authentication/two-factor-login.vue b/apps/vben5/apps/app-antd/src/views/_core/authentication/two-factor-login.vue
new file mode 100644
index 000000000..cf9270deb
--- /dev/null
+++ b/apps/vben5/apps/app-antd/src/views/_core/authentication/two-factor-login.vue
@@ -0,0 +1,206 @@
+
+
+
+
+ 基础表单演示
+ 设置表单值
+
+
+
+
+ 《秦皇岛》
住在我心里孤独的
孤独的海怪 痛苦之王
开始厌倦 + 深海的光 停滞的海浪 +
+
+ 住在我心里孤独的
孤独的海怪 痛苦之王
开始厌倦 + 深海的光 停滞的海浪 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ {{ $t('AbpUi.ProfilePicture') }}
+
+
+
+
+
+
+
diff --git a/apps/vben5/packages/@abp/account/src/components/components/AuthenticatorSettings.vue b/apps/vben5/packages/@abp/account/src/components/components/AuthenticatorSettings.vue
new file mode 100644
index 000000000..f41ec0dfa
--- /dev/null
+++ b/apps/vben5/packages/@abp/account/src/components/components/AuthenticatorSettings.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+ -
+
+ {{
+ $t('AbpAccount.Authenticator')
+ }}
+ {{
+ $t('AbpAccount.AuthenticatorDesc')
+ }}
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+ {{ authenticator?.sharedKey }}
+
+
+ {{
+ $t('AbpAccount.ValidAuthenticator')
+ }}
+ {{
+ $t('AbpAccount.ValidAuthenticatorDesc')
+ }}
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t('AbpAccount.RecoveryCode')
+ }}
+ {{
+ $t('AbpAccount.RecoveryCodeDesc')
+ }}
+
+
+
+
+
+
+
+
+ {{ recoveryCodes.slice(0, 5).join('\r\n') }}
+
+
+ {{ recoveryCodes.slice(5).join('\r\n') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ {{ $t('AbpUi.ProfilePicture') }}
+-
+
+
+
+
+
+
+ {{ auditLogModel.applicationName }}
+
+
+ {{ formatToDateTime(auditLogModel.executionTime) }}
+
+
+ {{ auditLogModel.userName }}
+
+
+
+ {{ auditLogModel.httpMethod }}
+
+
+
+ {{ auditLogModel.url }}
+
+
+
+ {{ auditLogModel.httpStatusCode }}
+
+
+
+ {{ auditLogModel.executionDuration }}
+
+
+ {{ auditLogModel.clientId }}
+
+
+ {{ auditLogModel.clientIpAddress }}
+
+
+ {{ auditLogModel.clientName }}
+
+
+ {{ auditLogModel.correlationId }}
+
+
+ {{ auditLogModel.browserInfo }}
+
+
+ {{ auditLogModel.comments }}
+
+
+ {{ auditLogModel.exceptions }}
+
+
+ {{ auditLogModel.extraProperties }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/vben5/packages/@abp/components/src/codeeditor/index.ts b/apps/vben5/packages/@abp/components/src/codeeditor/index.ts
new file mode 100644
index 000000000..6f9e255e7
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/codeeditor/index.ts
@@ -0,0 +1,2 @@
+export * from '../codemirror/types';
+export { default as CodeEditor } from './CodeEditor.vue';
diff --git a/apps/vben5/packages/@abp/components/src/codemirror/CodeMirror.vue b/apps/vben5/packages/@abp/components/src/codemirror/CodeMirror.vue
new file mode 100644
index 000000000..2eea2947f
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/codemirror/CodeMirror.vue
@@ -0,0 +1,136 @@
+
+
+
+
+
diff --git a/apps/vben5/packages/@abp/components/src/codemirror/codemirror.css b/apps/vben5/packages/@abp/components/src/codemirror/codemirror.css
new file mode 100644
index 000000000..cbcfa8764
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/codemirror/codemirror.css
@@ -0,0 +1,525 @@
+/* BASICS */
+
+.CodeMirror {
+ --base: #545281;
+ --comment: hsl(210deg 25% 60%);
+ --keyword: #af4ab1;
+ --variable: #0055d1;
+ --function: #c25205;
+ --string: #2ba46d;
+ --number: #c25205;
+ --tags: #d00;
+ --qualifier: #ff6032;
+ --important: var(--string);
+
+ position: relative;
+ height: auto;
+ height: 100%;
+ overflow: hidden;
+ font-family: var(--font-code);
+ background: white;
+ direction: ltr;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+ min-height: 1px; /* prevents collapsing before first draw */
+ padding: 4px 0; /* Vertical padding around content */
+ cursor: text;
+}
+
+.CodeMirror-scrollbar-filler,
+.CodeMirror-gutter-filler {
+ background-color: white; /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+ position: absolute;
+ top: 0;
+ left: 5 !important;
+ z-index: 3;
+ min-height: 100%;
+ white-space: nowrap;
+ background-color: transparent;
+ border-right: 1px solid #ddd;
+}
+
+.CodeMirror-linenumber {
+ min-width: 20px;
+ padding: 1 8px 0 5px;
+ color: var(--comment);
+ text-align: left !important;
+ white-space: nowrap;
+ opacity: 0.6;
+}
+
+.CodeMirror-guttermarker {
+ color: black;
+}
+
+.CodeMirror-guttermarker-subtle {
+ color: #999;
+}
+
+/* FOLD GUTTER */
+
+.CodeMirror-foldmarker {
+ font-family: arial;
+ line-height: 0.3;
+ color: #414141;
+ text-shadow: #f96 1px 1px 2px, #f96 -1px -1px 2px, #f96 1px -1px 2px, #f96 -1px 1px 2px;
+ cursor: pointer;
+}
+
+.CodeMirror-foldgutter {
+ width: 0.7em;
+}
+
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded {
+ cursor: pointer;
+}
+
+.CodeMirror-foldgutter-open::after,
+.CodeMirror-foldgutter-folded::after {
+ position: relative;
+ top: -0.1em;
+ display: inline-block;
+ font-size: 0.8em;
+ content: '>';
+ opacity: 0.8;
+ transform: rotate(90deg);
+ transition: transform 0.2s;
+}
+
+.CodeMirror-foldgutter-folded::after {
+ transform: none;
+}
+
+/* CURSOR */
+
+.CodeMirror-cursor {
+ position: absolute;
+ width: 0;
+ pointer-events: none;
+ border-right: none;
+ border-left: 1px solid black;
+}
+
+/* Shown when moving in bi-directional text */
+.CodeMirror div.CodeMirror-secondarycursor {
+ border-left: 1px solid silver;
+}
+
+.cm-fat-cursor .CodeMirror-cursor {
+ width: auto;
+ background: #7e7;
+ border: 0 !important;
+}
+
+.cm-fat-cursor div.CodeMirror-cursors {
+ z-index: 1;
+}
+
+.cm-fat-cursor-mark {
+ background-color: rgb(20 255 20 / 50%);
+ animation: blink 1.06s steps(1) infinite;
+}
+
+.cm-animate-fat-cursor {
+ width: auto;
+ background-color: #7e7;
+ border: 0;
+ animation: blink 1.06s steps(1) infinite;
+}
+@keyframes blink {
+ 50% {
+ background-color: transparent;
+ }
+}
+@keyframes blink {
+ 50% {
+ background-color: transparent;
+ }
+}
+@keyframes blink {
+ 50% {
+ background-color: transparent;
+ }
+}
+
+.cm-tab {
+ display: inline-block;
+ text-decoration: inherit;
+}
+
+.CodeMirror-rulers {
+ position: absolute;
+ top: -50px;
+ right: 0;
+ bottom: -20px;
+ left: 0;
+ overflow: hidden;
+}
+
+.CodeMirror-ruler {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ border-left: 1px solid #ccc;
+}
+
+/* DEFAULT THEME */
+.cm-s-default.CodeMirror {
+ background-color: transparent;
+}
+
+.cm-s-default .cm-header {
+ color: blue;
+}
+
+.cm-s-default .cm-quote {
+ color: #090;
+}
+
+.cm-negative {
+ color: #d44;
+}
+
+.cm-positive {
+ color: #292;
+}
+
+.cm-header,
+.cm-strong {
+ font-weight: bold;
+}
+
+.cm-em {
+ font-style: italic;
+}
+
+.cm-link {
+ text-decoration: underline;
+}
+
+.cm-strikethrough {
+ text-decoration: line-through;
+}
+
+.cm-s-default .cm-atom,
+.cm-s-default .cm-def,
+.cm-s-default .cm-property,
+.cm-s-default .cm-variable-2,
+.cm-s-default .cm-variable-3,
+.cm-s-default .cm-punctuation {
+ color: var(--base);
+}
+
+.cm-s-default .cm-hr,
+.cm-s-default .cm-comment {
+ color: var(--comment);
+}
+
+.cm-s-default .cm-attribute,
+.cm-s-default .cm-keyword {
+ color: var(--keyword);
+}
+
+.cm-s-default .cm-variable {
+ color: var(--variable);
+}
+
+.cm-s-default .cm-bracket,
+.cm-s-default .cm-tag {
+ color: var(--tags);
+}
+
+.cm-s-default .cm-number {
+ color: var(--number);
+}
+
+.cm-s-default .cm-string,
+.cm-s-default .cm-string-2 {
+ color: var(--string);
+}
+
+.cm-s-default .cm-type {
+ color: #085;
+}
+
+.cm-s-default .cm-meta {
+ color: #555;
+}
+
+.cm-s-default .cm-qualifier {
+ color: var(--qualifier);
+}
+
+.cm-s-default .cm-builtin {
+ color: #7539ff;
+}
+
+.cm-s-default .cm-link {
+ color: var(--flash);
+}
+
+.cm-s-default .cm-error {
+ color: #ff008c;
+}
+
+.cm-invalidchar {
+ color: #ff008c;
+}
+
+.CodeMirror-composing {
+ border-bottom: 2px solid;
+}
+
+/* Default styles for common addons */
+
+div.CodeMirror span.CodeMirror-matchingbracket {
+ color: #0b0;
+}
+
+div.CodeMirror span.CodeMirror-nonmatchingbracket {
+ color: #a22;
+}
+
+.CodeMirror-matchingtag {
+ background: rgb(255 150 0 / 30%);
+}
+
+.CodeMirror-activeline-background {
+ background: #e8f2ff;
+}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+ the editor. You probably shouldn't touch them. */
+
+.CodeMirror-scroll {
+ position: relative;
+ height: 100%;
+ padding-bottom: 30px;
+ margin-right: -30px;
+
+ /* 30px is the magic margin used to hide the element's real scrollbars */
+
+ /* See overflow: hidden in .CodeMirror */
+ margin-bottom: -30px;
+ overflow: scroll !important; /* Things will break if this is overridden */
+ outline: none; /* Prevent dragging from highlighting the element */
+}
+
+.CodeMirror-sizer {
+ position: relative;
+ margin-bottom: 20px !important;
+ border-right: 30px solid transparent;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+ before actual scrolling happens, thus preventing shaking and
+ flickering artifacts. */
+.CodeMirror-vscrollbar,
+.CodeMirror-hscrollbar,
+.CodeMirror-scrollbar-filler,
+.CodeMirror-gutter-filler {
+ position: absolute;
+ z-index: 6;
+ display: none;
+}
+
+.CodeMirror-vscrollbar {
+ top: 0;
+ right: 0;
+ overflow-x: hidden;
+ overflow-y: scroll;
+}
+
+.CodeMirror-hscrollbar {
+ bottom: 0;
+ left: 0;
+ overflow-x: scroll;
+ overflow-y: hidden;
+}
+
+.CodeMirror-scrollbar-filler {
+ right: 0;
+ bottom: 0;
+}
+
+.CodeMirror-gutter-filler {
+ bottom: 0;
+ left: 0;
+}
+
+.CodeMirror-gutter {
+ display: inline-block;
+ height: 100%;
+ margin-bottom: -30px;
+ white-space: normal;
+ vertical-align: top;
+}
+
+.CodeMirror-gutter-wrapper {
+ position: absolute;
+ z-index: 4;
+ background: none !important;
+ border: none !important;
+}
+
+.CodeMirror-gutter-background {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ z-index: 4;
+}
+
+.CodeMirror-gutter-elt {
+ position: absolute;
+ z-index: 4;
+ cursor: default;
+}
+
+.CodeMirror-gutter-wrapper ::selection {
+ background-color: transparent;
+}
+
+.CodeMirrorwrapper ::selection {
+ background-color: transparent;
+}
+
+.CodeMirror pre {
+ position: relative;
+ z-index: 2;
+ padding: 0 4px; /* Horizontal padding of content */
+ margin: 0;
+ overflow: visible;
+ font-family: inherit;
+ font-size: inherit;
+ line-height: inherit;
+ color: inherit;
+ word-wrap: normal;
+ white-space: pre;
+ background: transparent;
+ border-width: 0;
+
+ /* Reset some styles that the rest of the page might have set */
+ border-radius: 0;
+ -webkit-tap-highlight-color: transparent;
+ font-variant-ligatures: contextual;
+}
+
+.CodeMirror-wrap pre {
+ word-break: normal;
+ word-wrap: break-word;
+ white-space: pre-wrap;
+}
+
+.CodeMirror-linebackground {
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ z-index: 0;
+}
+
+.CodeMirror-linewidget {
+ position: relative;
+ z-index: 2;
+ padding: 0.1px; /* Force widget margins to stay inside of the container */
+}
+
+.CodeMirror-rtl pre {
+ direction: rtl;
+}
+
+.CodeMirror-code {
+ outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+ box-sizing: content-box;
+}
+
+.CodeMirror-measure {
+ position: absolute;
+ width: 100%;
+ height: 0;
+ overflow: hidden;
+ visibility: hidden;
+}
+
+.CodeMirror-measure pre {
+ position: static;
+}
+
+div.CodeMirror-cursors {
+ position: relative;
+ z-index: 3;
+ visibility: hidden;
+}
+
+div.CodeMirror-dragcursors {
+ visibility: visible;
+}
+
+.CodeMirror-focused div.CodeMirror-cursors {
+ visibility: visible;
+}
+
+.CodeMirror-selected {
+ background: #d9d9d9;
+}
+
+.CodeMirror-focused .CodeMirror-selected {
+ background: #d7d4f0;
+}
+
+.CodeMirror-crosshair {
+ cursor: crosshair;
+}
+
+.CodeMirror-line::selection,
+.CodeMirror-line > span::selection,
+.CodeMirror-line > span > span::selection {
+ background: #d7d4f0;
+}
+
+.cm-searching {
+ background-color: #ffa;
+ background-color: rgb(255 255 0 / 40%);
+}
+
+/* Used to force a border model for a node */
+.cm-force-border {
+ padding-right: 0.1px;
+}
+
+@media print {
+ /* Hide the cursor when printing */
+ .CodeMirror div.CodeMirror-cursors {
+ visibility: hidden;
+ }
+}
+
+/* See issue #2901 */
+.cm-tab-wrap-hack::after {
+ content: '';
+}
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext {
+ background: none;
+}
diff --git a/apps/vben5/packages/@abp/components/src/codemirror/codemirror.ts b/apps/vben5/packages/@abp/components/src/codemirror/codemirror.ts
new file mode 100644
index 000000000..ad87e70b7
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/codemirror/codemirror.ts
@@ -0,0 +1,21 @@
+import './codemirror.css';
+import 'codemirror/theme/idea.css';
+import 'codemirror/theme/material-palenight.css';
+// import 'codemirror/addon/lint/lint.css';
+
+// modes
+import 'codemirror/mode/javascript/javascript';
+import 'codemirror/mode/css/css';
+import 'codemirror/mode/htmlmixed/htmlmixed';
+// addons
+// import 'codemirror/addon/edit/closebrackets';
+// import 'codemirror/addon/edit/closetag';
+// import 'codemirror/addon/comment/comment';
+// import 'codemirror/addon/fold/foldcode';
+// import 'codemirror/addon/fold/foldgutter';
+// import 'codemirror/addon/fold/brace-fold';
+// import 'codemirror/addon/fold/indent-fold';
+// import 'codemirror/addon/lint/json-lint';
+// import 'codemirror/addon/fold/comment-fold';
+
+export { default as CodeMirror } from 'codemirror';
diff --git a/apps/vben5/packages/@abp/components/src/codemirror/index.ts b/apps/vben5/packages/@abp/components/src/codemirror/index.ts
new file mode 100644
index 000000000..3898fc040
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/codemirror/index.ts
@@ -0,0 +1,2 @@
+export { default as CodeMirror } from './CodeMirror.vue';
+export * from './types';
diff --git a/apps/vben5/packages/@abp/components/src/codemirror/types.ts b/apps/vben5/packages/@abp/components/src/codemirror/types.ts
new file mode 100644
index 000000000..1b7e3e32a
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/codemirror/types.ts
@@ -0,0 +1,5 @@
+export enum MODE {
+ HTML = 'htmlmixed',
+ JS = 'javascript',
+ JSON = 'application/json',
+}
diff --git a/apps/vben5/packages/@abp/components/src/tinymce/Editor.vue b/apps/vben5/packages/@abp/components/src/tinymce/Editor.vue
new file mode 100644
index 000000000..a43236ec1
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/tinymce/Editor.vue
@@ -0,0 +1,312 @@
+
+
+
+
+
+
+
+
+
diff --git a/apps/vben5/packages/@abp/components/src/tinymce/helper.ts b/apps/vben5/packages/@abp/components/src/tinymce/helper.ts
new file mode 100644
index 000000000..6b331df4e
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/tinymce/helper.ts
@@ -0,0 +1,85 @@
+const validEvents = new Set([
+ 'onActivate',
+ 'onAddUndo',
+ 'onBeforeAddUndo',
+ 'onBeforeExecCommand',
+ 'onBeforeGetContent',
+ 'onBeforePaste',
+ 'onBeforeRenderUI',
+ 'onBeforeSetContent',
+ 'onBlur',
+ 'onChange',
+ 'onClearUndos',
+ 'onClick',
+ 'onContextMenu',
+ 'onCopy',
+ 'onCut',
+ 'onDblclick',
+ 'onDeactivate',
+ 'onDirty',
+ 'onDrag',
+ 'onDragDrop',
+ 'onDragEnd',
+ 'onDragGesture',
+ 'onDragOver',
+ 'onDrop',
+ 'onExecCommand',
+ 'onFocus',
+ 'onFocusIn',
+ 'onFocusOut',
+ 'onGetContent',
+ 'onHide',
+ 'onInit',
+ 'onKeyDown',
+ 'onKeyPress',
+ 'onKeyUp',
+ 'onLoadContent',
+ 'onMouseDown',
+ 'onMouseEnter',
+ 'onMouseLeave',
+ 'onMouseMove',
+ 'onMouseOut',
+ 'onMouseOver',
+ 'onMouseUp',
+ 'onNodeChange',
+ 'onObjectResized',
+ 'onObjectResizeStart',
+ 'onObjectSelected',
+ 'onPaste',
+ 'onPostProcess',
+ 'onPostRender',
+ 'onPreProcess',
+ 'onProgressState',
+ 'onRedo',
+ 'onRemove',
+ 'onReset',
+ 'onSaveContent',
+ 'onSelectionChange',
+ 'onSetAttrib',
+ 'onSetContent',
+ 'onShow',
+ 'onSubmit',
+ 'onUndo',
+ 'onVisualAid',
+]);
+
+const isValidKey = (key: string) => validEvents.has(key);
+
+export const bindHandlers = (
+ initEvent: Event,
+ listeners: any,
+ editor: any,
+): void => {
+ Object.keys(listeners)
+ .filter((key) => isValidKey(key))
+ .forEach((key: string) => {
+ const handler = listeners[key];
+ if (typeof handler === 'function') {
+ if (key === 'onInit') {
+ handler(initEvent, editor);
+ } else {
+ editor.on(key.slice(2), (e: any) => handler(e, editor));
+ }
+ }
+ });
+};
diff --git a/apps/vben5/packages/@abp/components/src/tinymce/index.ts b/apps/vben5/packages/@abp/components/src/tinymce/index.ts
new file mode 100644
index 000000000..5f4575450
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/tinymce/index.ts
@@ -0,0 +1 @@
+export { default as Tinymce } from './Editor.vue';
diff --git a/apps/vben5/packages/@abp/components/src/tinymce/tinymce.ts b/apps/vben5/packages/@abp/components/src/tinymce/tinymce.ts
new file mode 100644
index 000000000..1374b4dab
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/tinymce/tinymce.ts
@@ -0,0 +1,13 @@
+// Any plugins you want to setting has to be imported
+// Detail plugins list see https://www.tinymce.com/docs/plugins/
+// Custom builds see https://www.tinymce.com/download/custom-builds/
+// colorpicker/contextmenu/textcolor plugin is now built in to the core editor, please remove it from your editor configuration
+
+export const plugins = [
+ 'advlist anchor autolink autosave code codesample directionality fullscreen hr insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus template textpattern visualblocks visualchars wordcount',
+];
+
+export const toolbar = [
+ 'fontsizeselect lineheight searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript code codesample',
+ 'hr bullist numlist link preview anchor pagebreak insertdatetime media forecolor backcolor fullscreen',
+];
diff --git a/apps/vben5/packages/@abp/components/src/tinymce/useTinymce.ts b/apps/vben5/packages/@abp/components/src/tinymce/useTinymce.ts
new file mode 100644
index 000000000..0857db940
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/src/tinymce/useTinymce.ts
@@ -0,0 +1,13 @@
+let unique = 0;
+export function useTinymce() {
+ function buildShortUUID(prefix = ''): string {
+ const time = Date.now();
+ const random = Math.floor(Math.random() * 1_000_000_000);
+ unique++;
+ return `${prefix}_${random}${unique}${String(time)}`;
+ }
+
+ return {
+ buildShortUUID,
+ };
+}
diff --git a/apps/vben5/packages/@abp/components/tsconfig.json b/apps/vben5/packages/@abp/components/tsconfig.json
new file mode 100644
index 000000000..ce1a891fb
--- /dev/null
+++ b/apps/vben5/packages/@abp/components/tsconfig.json
@@ -0,0 +1,6 @@
+{
+ "$schema": "https://json.schemastore.org/tsconfig",
+ "extends": "@vben/tsconfig/web.json",
+ "include": ["src"],
+ "exclude": ["node_modules"]
+}
diff --git a/apps/vben5/packages/@abp/core/package.json b/apps/vben5/packages/@abp/core/package.json
index 7ffa6d8e4..2ec3857eb 100644
--- a/apps/vben5/packages/@abp/core/package.json
+++ b/apps/vben5/packages/@abp/core/package.json
@@ -1,6 +1,6 @@
{
"name": "@abp/core",
- "version": "8.3.2",
+ "version": "9.0.4",
"homepage": "https://github.com/colinin/abp-next-admin",
"bugs": "https://github.com/colinin/abp-next-admin/issues",
"repository": {
@@ -35,8 +35,14 @@
}
},
"dependencies": {
+ "@vueuse/core": "catalog:",
"dayjs": "catalog:",
+ "lodash.merge": "catalog:",
"pinia": "catalog:",
+ "pinia-plugin-persistedstate": "catalog:",
"vue": "catalog:"
+ },
+ "devDependencies": {
+ "@types/lodash.merge": "catalog:"
}
}
diff --git a/apps/vben5/packages/@abp/core/src/constants/events.ts b/apps/vben5/packages/@abp/core/src/constants/events.ts
new file mode 100644
index 000000000..eb2360775
--- /dev/null
+++ b/apps/vben5/packages/@abp/core/src/constants/events.ts
@@ -0,0 +1,10 @@
+export const Events = {
+ /** 收到服务器消息 */
+ GetNotification: 'get-notification',
+ /** 新通知消息 */
+ NotificationRecevied: 'sys_notifications_recevied',
+ /** 用户登录事件 */
+ UserLogin: 'sys_user_login',
+ /** 用户登出事件 */
+ UserLogout: 'sys_user_logout',
+};
diff --git a/apps/vben5/packages/@abp/core/src/constants/index.ts b/apps/vben5/packages/@abp/core/src/constants/index.ts
new file mode 100644
index 000000000..b624aad55
--- /dev/null
+++ b/apps/vben5/packages/@abp/core/src/constants/index.ts
@@ -0,0 +1,2 @@
+export * from './events';
+export * from './validation';
diff --git a/apps/vben5/packages/@abp/core/src/constants/validation.ts b/apps/vben5/packages/@abp/core/src/constants/validation.ts
new file mode 100644
index 000000000..27680e687
--- /dev/null
+++ b/apps/vben5/packages/@abp/core/src/constants/validation.ts
@@ -0,0 +1,46 @@
+export const ValidationEnum = {
+ DoNotMatch: "'{0}' and '{1}' do not match.",
+ FieldDoNotValidCreditCardNumber:
+ 'The {0} field is not a valid credit card number.',
+ FieldDoNotValidEmailAddress: 'The {0} field is not a valid e-mail address.',
+ FieldDoNotValidFullyQualifiedUrl:
+ 'The {0} field is not a valid fully-qualified http, https, or ftp URL.',
+ FieldDoNotValidPhoneNumber: 'The {0} field is not a valid phone number.',
+ FieldInvalid: 'The field {0} is invalid.',
+ FieldIsNotValid: '{0} is not valid.',
+ FieldMustBeetWeen: 'The field {0} must be between {1} and {2}.',
+ FieldMustBeStringOrArrayWithMaximumLength:
+ "The field {0} must be a string or array type with a maximum length of '{1}'.",
+ FieldMustBeStringOrArrayWithMinimumLength:
+ "The field {0} must be a string or array type with a minimum length of '{1}'.",
+ FieldMustBeStringWithMaximumLength:
+ 'The field {0} must be a string with a maximum length of {1}.',
+ FieldMustBeStringWithMinimumLengthAndMaximumLength:
+ 'The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.',
+ FieldMustMatchRegularExpression:
+ "The field {0} must match the regular expression '{1}'.",
+ FieldOnlyAcceptsFilesExtensions:
+ 'The {0} field only accepts files with the following extensions: {1}',
+ FieldRequired: 'The {0} field is required.',
+ ThisFieldIsInvalid: 'ThisFieldIsInvalid.',
+ ThisFieldIsNotAValidCreditCardNumber: 'ThisFieldIsNotAValidCreditCardNumber.',
+ ThisFieldIsNotAValidEmailAddress: 'ThisFieldIsNotAValidEmailAddress.',
+ ThisFieldIsNotAValidFullyQualifiedHttpHttpsOrFtpUrl:
+ 'ThisFieldIsNotAValidFullyQualifiedHttpHttpsOrFtpUrl',
+ ThisFieldIsNotAValidPhoneNumber: 'ThisFieldIsNotAValidPhoneNumber.',
+ ThisFieldIsNotValid: 'ThisFieldIsNotValid.',
+ ThisFieldIsRequired: 'ThisFieldIsRequired.',
+ ThisFieldMustBeAStringOrArrayTypeWithAMaximumLength:
+ 'ThisFieldMustBeAStringOrArrayTypeWithAMaximumLengthOf{0}',
+ ThisFieldMustBeAStringOrArrayTypeWithAMinimumLength:
+ 'ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf{0}',
+ ThisFieldMustBeAStringWithAMaximumLength:
+ 'ThisFieldMustBeAStringWithAMaximumLengthOf{0}',
+ ThisFieldMustBeAStringWithAMinimumLengthAndAMaximumLength:
+ 'ThisFieldMustBeAStringWithAMinimumLengthOf{1}AndAMaximumLengthOf{0}',
+ ThisFieldMustBeBetween: 'ThisFieldMustBeBetween{0}And{1}',
+ ThisFieldMustMatchTheRegularExpression:
+ 'ThisFieldMustMatchTheRegularExpression{0}',
+ ThisFieldOnlyAcceptsFilesWithTheFollowingExtensions:
+ 'ThisFieldOnlyAcceptsFilesWithTheFollowingExtensions:{0}',
+};
diff --git a/apps/vben5/packages/@abp/core/src/hooks/SimpleStateChecking/useRequireAuthenticatedSimpleStateChecker.ts b/apps/vben5/packages/@abp/core/src/hooks/SimpleStateChecking/useRequireAuthenticatedSimpleStateChecker.ts
new file mode 100644
index 000000000..83c370e56
--- /dev/null
+++ b/apps/vben5/packages/@abp/core/src/hooks/SimpleStateChecking/useRequireAuthenticatedSimpleStateChecker.ts
@@ -0,0 +1,42 @@
+import type {
+ CurrentUser,
+ IHasSimpleStateCheckers,
+ ISimpleStateChecker,
+ SimpleStateCheckerContext,
+} from '../../types/global';
+
+import { useAbpStore } from '../../store/abp';
+
+export interface RequireAuthenticatedStateChecker {
+ name: string;
+}
+
+export class RequireAuthenticatedSimpleStateChecker<
+ TState extends IHasSimpleStateCheckers