@oinone/kunlun-vue-admin-base 7.2.0 → 7.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/oinone-kunlun-vue-admin-base.css +1 -1
- package/dist/oinone-kunlun-vue-admin-base.esm.js +17 -17
- package/dist/oinone-kunlun-vue-admin-base.scss +1 -1
- package/dist/types/src/action/component/action-bar/DefaultActionBar.vue.d.ts +9 -0
- package/dist/types/src/basic/BaseActionGroupWidget.d.ts +1 -0
- package/dist/types/src/basic/field/complex/subview/FormSubviewListFieldWidget.d.ts +2 -1
- package/dist/types/src/field/detail/m2m/table/DetailM2MTableFieldWidget.d.ts +0 -1
- package/dist/types/src/field/detail/o2m/table/DetailO2MTableFieldWidget.d.ts +0 -1
- package/dist/types/src/field/eip/index.d.ts +1 -0
- package/package.json +8 -8
- package/src/action/component/action-bar/DefaultActionBar.vue +7 -0
- package/src/action/component/action-bar/style/index.scss +10 -2
- package/src/basic/BaseActionGroupWidget.ts +6 -1
- package/src/basic/field/complex/subview/FormSubviewListFieldWidget.ts +17 -2
- package/src/field/detail/m2m/table/DetailM2MTableFieldWidget.ts +0 -12
- package/src/field/detail/o2m/table/DetailO2MTableFieldWidget.ts +0 -12
- package/src/field/eip/index.ts +2 -0
- package/src/field/eip/style/eip-global.scss +17 -0
- package/src/field/form/string/expression/condition/conditionBaseControlWidget.ts +7 -3
- package/src/main.ts +5 -0
- package/src/view/application-screen/import-and-export-element/AppTreeMenuTableWidget.ts +6 -1
- package/src/view/login/LoginWidget.ts +2 -2
|
@@ -43,6 +43,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
|
|
|
43
43
|
direction: {
|
|
44
44
|
type: StringConstructor;
|
|
45
45
|
};
|
|
46
|
+
overflow: {
|
|
47
|
+
type: BooleanConstructor;
|
|
48
|
+
default: undefined;
|
|
49
|
+
};
|
|
46
50
|
operatorColumnDirection: {
|
|
47
51
|
type: PropType<OperationColumnDirection | keyof typeof OperationColumnDirection>;
|
|
48
52
|
};
|
|
@@ -126,6 +130,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
|
|
|
126
130
|
direction: {
|
|
127
131
|
type: StringConstructor;
|
|
128
132
|
};
|
|
133
|
+
overflow: {
|
|
134
|
+
type: BooleanConstructor;
|
|
135
|
+
default: undefined;
|
|
136
|
+
};
|
|
129
137
|
operatorColumnDirection: {
|
|
130
138
|
type: PropType<OperationColumnDirection | keyof typeof OperationColumnDirection>;
|
|
131
139
|
};
|
|
@@ -163,6 +171,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
|
|
|
163
171
|
}>> & Readonly<{}>, {
|
|
164
172
|
invisible: boolean;
|
|
165
173
|
inline: boolean;
|
|
174
|
+
overflow: boolean;
|
|
166
175
|
isFloat: boolean;
|
|
167
176
|
}, {}, {
|
|
168
177
|
DownOutlined: import("@ant-design/icons-vue/lib/icons/DownOutlined").DownOutlinedIconType;
|
|
@@ -14,6 +14,7 @@ export declare class BaseActionGroupWidget<T extends ActiveRecordsWidgetProps =
|
|
|
14
14
|
*/
|
|
15
15
|
protected refreshCallChaining: CallChaining<boolean> | undefined;
|
|
16
16
|
protected showActionNames: string[] | undefined;
|
|
17
|
+
protected get overflow(): boolean | undefined;
|
|
17
18
|
protected showActionNamesProcess(): string[];
|
|
18
19
|
protected resetShowActionNames(): void;
|
|
19
20
|
protected $$mounted(): void;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type ActiveRecord, type ActiveRecords, type DeleteActiveRecordsByEntityPredict, type RuntimeM2MField, type RuntimeO2MField, SubmitCacheManager } from '@oinone/kunlun-engine';
|
|
2
2
|
import { ViewType } from '@oinone/kunlun-meta';
|
|
3
3
|
import { Condition } from '@oinone/kunlun-request';
|
|
4
|
-
import
|
|
4
|
+
import { ReturnPromise } from '@oinone/kunlun-shared';
|
|
5
5
|
import { ComputeTrigger, WidgetTrigger } from '@oinone/kunlun-vue-ui-common';
|
|
6
6
|
import type { IFormSubviewListFieldWidget, RefreshProcessFunction } from '../../../types';
|
|
7
7
|
import type { FormComplexFieldProps } from '../FormComplexFieldWidget';
|
|
@@ -21,6 +21,7 @@ export declare class FormSubviewListFieldWidget<Field extends RuntimeO2MField |
|
|
|
21
21
|
reloadActiveRecords(records: ActiveRecords | undefined): void;
|
|
22
22
|
deleteDataSource(recordIndexes: number[]): void;
|
|
23
23
|
deleteDataSourceByEntity(records: ActiveRecords, predict?: DeleteActiveRecordsByEntityPredict): void;
|
|
24
|
+
protected get disabledRelationQuery(): boolean | undefined;
|
|
24
25
|
afterTriggerExecute(trigger: WidgetTrigger): Promise<void>;
|
|
25
26
|
flushDataSource(): void;
|
|
26
27
|
protected repairTablePagination(): void;
|
|
@@ -3,6 +3,5 @@ import type { ReturnPromise } from '@oinone/kunlun-shared';
|
|
|
3
3
|
import { FormSubviewListFieldWidget } from '../../../../basic';
|
|
4
4
|
export declare class DetailM2MTableFieldWidget extends FormSubviewListFieldWidget<RuntimeM2MField> {
|
|
5
5
|
protected refreshValueProcess(): Promise<void>;
|
|
6
|
-
protected get disabledRelationQuery(): boolean | undefined;
|
|
7
6
|
protected initSubviewData(): ReturnPromise<void>;
|
|
8
7
|
}
|
|
@@ -3,6 +3,5 @@ import type { ReturnPromise } from '@oinone/kunlun-shared';
|
|
|
3
3
|
import { FormSubviewListFieldWidget } from '../../../../basic';
|
|
4
4
|
export declare class DetailO2MTableFieldWidget extends FormSubviewListFieldWidget<RuntimeO2MField> {
|
|
5
5
|
protected refreshValueProcess(): Promise<void>;
|
|
6
|
-
protected get disabledRelationQuery(): boolean | undefined;
|
|
7
6
|
protected initSubviewData(): ReturnPromise<void>;
|
|
8
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oinone/kunlun-vue-admin-base",
|
|
3
|
-
"version": "7.2.
|
|
3
|
+
"version": "7.2.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/oinone-kunlun-vue-admin-base.esm.js",
|
|
6
6
|
"scripts": {
|
|
@@ -17,13 +17,13 @@
|
|
|
17
17
|
"doc": "typedoc --out docs src/index.ts"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@oinone/kunlun-vue-admin-layout": "7.2.
|
|
21
|
-
"@oinone/kunlun-vue-router": "7.2.
|
|
22
|
-
"@oinone/kunlun-vue-ui": "7.2.
|
|
23
|
-
"@oinone/kunlun-vue-ui-antd": "7.2.
|
|
24
|
-
"@oinone/kunlun-vue-ui-common": "7.2.
|
|
25
|
-
"@oinone/kunlun-vue-ui-el": "7.2.
|
|
26
|
-
"@oinone/kunlun-vue-widget": "7.2.
|
|
20
|
+
"@oinone/kunlun-vue-admin-layout": "7.2.2",
|
|
21
|
+
"@oinone/kunlun-vue-router": "7.2.2",
|
|
22
|
+
"@oinone/kunlun-vue-ui": "7.2.2",
|
|
23
|
+
"@oinone/kunlun-vue-ui-antd": "7.2.2",
|
|
24
|
+
"@oinone/kunlun-vue-ui-common": "7.2.2",
|
|
25
|
+
"@oinone/kunlun-vue-ui-el": "7.2.2",
|
|
26
|
+
"@oinone/kunlun-vue-widget": "7.2.2",
|
|
27
27
|
"@wangeditor/editor": "5.1.23",
|
|
28
28
|
"@wangeditor/editor-for-vue": "5.1.11",
|
|
29
29
|
"@wangeditor/plugin-upload-attachment": "1.1.0",
|
|
@@ -149,6 +149,10 @@ export default defineComponent({
|
|
|
149
149
|
direction: {
|
|
150
150
|
type: String
|
|
151
151
|
},
|
|
152
|
+
overflow: {
|
|
153
|
+
type: Boolean,
|
|
154
|
+
default: undefined
|
|
155
|
+
},
|
|
152
156
|
operatorColumnDirection: {
|
|
153
157
|
type: String as PropType<OperationColumnDirection | keyof typeof OperationColumnDirection>
|
|
154
158
|
},
|
|
@@ -338,6 +342,9 @@ export default defineComponent({
|
|
|
338
342
|
if (this.justify) {
|
|
339
343
|
classList.push(`${actionBarClassName}-${this.justify}`);
|
|
340
344
|
}
|
|
345
|
+
if (this.overflow !== false) {
|
|
346
|
+
classList.push(`${actionBarClassName}-overflow`);
|
|
347
|
+
}
|
|
341
348
|
if (this.isFloat) {
|
|
342
349
|
classList.push(`${actionBarClassName}-float`);
|
|
343
350
|
}
|
|
@@ -8,7 +8,16 @@
|
|
|
8
8
|
display: flex;
|
|
9
9
|
align-items: center;
|
|
10
10
|
flex-flow: row nowrap;
|
|
11
|
-
|
|
11
|
+
|
|
12
|
+
&.action-bar-overflow {
|
|
13
|
+
overflow: auto hidden;
|
|
14
|
+
|
|
15
|
+
.action-bar-left,
|
|
16
|
+
.action-bar-center,
|
|
17
|
+
.action-bar-right {
|
|
18
|
+
overflow: auto hidden;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
12
21
|
|
|
13
22
|
&.action-bar-flatten {
|
|
14
23
|
gap: 12px var(--oio-margin-md);
|
|
@@ -40,7 +49,6 @@
|
|
|
40
49
|
display: flex;
|
|
41
50
|
flex-flow: row nowrap;
|
|
42
51
|
align-items: center;
|
|
43
|
-
overflow: auto hidden;
|
|
44
52
|
gap: 12px var(--oio-margin-md);
|
|
45
53
|
}
|
|
46
54
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CallChaining, CastHelper } from '@oinone/kunlun-shared';
|
|
1
|
+
import { BooleanHelper, CallChaining, CastHelper } from '@oinone/kunlun-shared';
|
|
2
2
|
import { type ActiveRecordsWidgetProps, executeInvisible, Widget } from '@oinone/kunlun-vue-widget';
|
|
3
3
|
import { BaseActionWidget, BaseElementWidget } from './token';
|
|
4
4
|
|
|
@@ -26,6 +26,11 @@ export class BaseActionGroupWidget<
|
|
|
26
26
|
@Widget.Reactive()
|
|
27
27
|
protected showActionNames: string[] | undefined;
|
|
28
28
|
|
|
29
|
+
@Widget.Reactive()
|
|
30
|
+
protected get overflow() {
|
|
31
|
+
return BooleanHelper.toBoolean(this.getDsl().overflow);
|
|
32
|
+
}
|
|
33
|
+
|
|
29
34
|
protected showActionNamesProcess(): string[] {
|
|
30
35
|
const showActionNames: Set<string> = new Set();
|
|
31
36
|
this.getChildren().forEach((widget) => {
|
|
@@ -9,9 +9,9 @@ import {
|
|
|
9
9
|
} from '@oinone/kunlun-engine';
|
|
10
10
|
import { ViewType } from '@oinone/kunlun-meta';
|
|
11
11
|
import { Condition } from '@oinone/kunlun-request';
|
|
12
|
-
import
|
|
12
|
+
import { BooleanHelper, ReturnPromise } from '@oinone/kunlun-shared';
|
|
13
13
|
import { ComputeTrigger, WidgetTrigger } from '@oinone/kunlun-vue-ui-common';
|
|
14
|
-
import { Widget } from '@oinone/kunlun-vue-widget';
|
|
14
|
+
import { isDetailViewState, Widget } from '@oinone/kunlun-vue-widget';
|
|
15
15
|
import { InlineTable } from '../../../../components';
|
|
16
16
|
import type { IFormSubviewListFieldWidget, RefreshProcessFunction } from '../../../types';
|
|
17
17
|
import type { FormComplexFieldProps } from '../FormComplexFieldWidget';
|
|
@@ -97,6 +97,21 @@ export class FormSubviewListFieldWidget<
|
|
|
97
97
|
super.deleteDataSourceByEntity(records, predict);
|
|
98
98
|
}
|
|
99
99
|
|
|
100
|
+
@Widget.Reactive()
|
|
101
|
+
protected get disabledRelationQuery() {
|
|
102
|
+
const disabledRelationQuery = BooleanHelper.toBoolean(this.getDsl().disabledRelationQuery);
|
|
103
|
+
if (disabledRelationQuery != null) {
|
|
104
|
+
return disabledRelationQuery;
|
|
105
|
+
}
|
|
106
|
+
if (this.viewState && isDetailViewState(this.viewState)) {
|
|
107
|
+
if (this.inline) {
|
|
108
|
+
return this.viewState.disabledRelationQuery;
|
|
109
|
+
}
|
|
110
|
+
return this.viewState.disabledRelationQuery || this.globalState?.disabledRelationQuery;
|
|
111
|
+
}
|
|
112
|
+
return this.globalState?.disabledRelationQuery;
|
|
113
|
+
}
|
|
114
|
+
|
|
100
115
|
public async afterTriggerExecute(trigger: WidgetTrigger) {
|
|
101
116
|
await super.afterTriggerExecute(trigger);
|
|
102
117
|
|
|
@@ -2,7 +2,6 @@ import type { ActiveRecord, RuntimeM2MField } from '@oinone/kunlun-engine';
|
|
|
2
2
|
import { ModelFieldType, ViewMode, ViewType } from '@oinone/kunlun-meta';
|
|
3
3
|
import type { ReturnPromise } from '@oinone/kunlun-shared';
|
|
4
4
|
import { SPI } from '@oinone/kunlun-spi';
|
|
5
|
-
import { isDetailViewState, Widget } from '@oinone/kunlun-vue-widget';
|
|
6
5
|
import { BaseFieldWidget, FormSubviewListFieldWidget, RelationQueryHelper } from '../../../../basic';
|
|
7
6
|
import { TABLE_WIDGET } from '../../../../typing';
|
|
8
7
|
|
|
@@ -20,17 +19,6 @@ export class DetailM2MTableFieldWidget extends FormSubviewListFieldWidget<Runtim
|
|
|
20
19
|
}
|
|
21
20
|
}
|
|
22
21
|
|
|
23
|
-
@Widget.Reactive()
|
|
24
|
-
protected get disabledRelationQuery() {
|
|
25
|
-
if (this.viewState && isDetailViewState(this.viewState)) {
|
|
26
|
-
if (this.inline) {
|
|
27
|
-
return this.viewState.disabledRelationQuery;
|
|
28
|
-
}
|
|
29
|
-
return this.viewState.disabledRelationQuery || this.globalState?.disabledRelationQuery;
|
|
30
|
-
}
|
|
31
|
-
return this.globalState?.disabledRelationQuery;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
22
|
protected initSubviewData(): ReturnPromise<void> {
|
|
35
23
|
if (this.disabledRelationQuery) {
|
|
36
24
|
super.initSubviewData();
|
|
@@ -3,7 +3,6 @@ import { ModelFieldType, ViewMode, ViewType } from '@oinone/kunlun-meta';
|
|
|
3
3
|
import { Condition } from '@oinone/kunlun-request';
|
|
4
4
|
import type { ReturnPromise } from '@oinone/kunlun-shared';
|
|
5
5
|
import { SPI } from '@oinone/kunlun-spi';
|
|
6
|
-
import { isDetailViewState, Widget } from '@oinone/kunlun-vue-widget';
|
|
7
6
|
import { BaseFieldWidget, FormSubviewListFieldWidget, RelationQueryHelper } from '../../../../basic';
|
|
8
7
|
import { TABLE_WIDGET } from '../../../../typing';
|
|
9
8
|
|
|
@@ -21,17 +20,6 @@ export class DetailO2MTableFieldWidget extends FormSubviewListFieldWidget<Runtim
|
|
|
21
20
|
}
|
|
22
21
|
}
|
|
23
22
|
|
|
24
|
-
@Widget.Reactive()
|
|
25
|
-
protected get disabledRelationQuery() {
|
|
26
|
-
if (this.viewState && isDetailViewState(this.viewState)) {
|
|
27
|
-
if (this.inline) {
|
|
28
|
-
return this.viewState.disabledRelationQuery;
|
|
29
|
-
}
|
|
30
|
-
return this.viewState.disabledRelationQuery || this.globalState?.disabledRelationQuery;
|
|
31
|
-
}
|
|
32
|
-
return this.globalState?.disabledRelationQuery;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
23
|
protected initSubviewData(): ReturnPromise<void> {
|
|
36
24
|
if (this.disabledRelationQuery) {
|
|
37
25
|
super.initSubviewData();
|
package/src/field/eip/index.ts
CHANGED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
.eip-runtime-error-text {
|
|
2
|
+
.detail-string-value {
|
|
3
|
+
color: var(--oio-error-color);
|
|
4
|
+
}
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
.eip-runtime-success-text {
|
|
8
|
+
.detail-string-value {
|
|
9
|
+
color: var(--oio-success-color);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
.eip-runtime-warning-text {
|
|
14
|
+
.detail-string-value {
|
|
15
|
+
color: var(--oio-warning-color);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
@@ -74,10 +74,14 @@ export class ConditionBaseControlWidget extends ExpressionAbstractWidget {
|
|
|
74
74
|
|
|
75
75
|
const list = valueList || [];
|
|
76
76
|
|
|
77
|
-
if (
|
|
78
|
-
|
|
77
|
+
if (this.sourceCode) {
|
|
78
|
+
if (list.length) {
|
|
79
|
+
const valueList = list[0].valueList || [];
|
|
79
80
|
|
|
80
|
-
|
|
81
|
+
if (!valueList.some((v) => v.value)) {
|
|
82
|
+
this.hasChangeSourceCode = true;
|
|
83
|
+
}
|
|
84
|
+
} else {
|
|
81
85
|
this.hasChangeSourceCode = true;
|
|
82
86
|
}
|
|
83
87
|
}
|
package/src/main.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
+
CurrentLanguage,
|
|
2
3
|
frameworkFactory,
|
|
3
4
|
type FrameworkInitializeService,
|
|
4
5
|
FrameworkInitializeSPI,
|
|
@@ -14,6 +15,7 @@ import { SPIFactory } from '@oinone/kunlun-spi';
|
|
|
14
15
|
import { maskInstall } from '@oinone/kunlun-vue-admin-layout';
|
|
15
16
|
import { Boot } from '@wangeditor/editor';
|
|
16
17
|
import attachmentModule from '@wangeditor/plugin-upload-attachment';
|
|
18
|
+
import moment from 'moment';
|
|
17
19
|
import { type App, getCurrentInstance } from 'vue';
|
|
18
20
|
import { createApp as CreateVueApp } from './create_app';
|
|
19
21
|
import enUs from './locale/en_US';
|
|
@@ -38,6 +40,9 @@ export class VueFrameworkInitializeService implements FrameworkInitializeService
|
|
|
38
40
|
public after(props: OioProviderProps) {
|
|
39
41
|
maskInstall();
|
|
40
42
|
install();
|
|
43
|
+
CurrentLanguage.getIsoCode().then((isoCode) => {
|
|
44
|
+
moment.locale(isoCode);
|
|
45
|
+
});
|
|
41
46
|
const app = RuntimeContextManager.createOrReplace<App>().frameworkInstance;
|
|
42
47
|
app.mount('#app');
|
|
43
48
|
}
|
|
@@ -39,7 +39,12 @@ export class AppTreeMenuTableWidget extends TableWidget {
|
|
|
39
39
|
BaseElementWidget.Token({
|
|
40
40
|
viewType: ViewType.Table,
|
|
41
41
|
widget: ['table', 'Table'],
|
|
42
|
-
model: [
|
|
42
|
+
model: [
|
|
43
|
+
'dmeta.DataDesignerItemMetaExport',
|
|
44
|
+
'dmeta.EipDesignerConnectorAppMetaExport',
|
|
45
|
+
'dmeta.EipDesignerConnectorDBMetaExport',
|
|
46
|
+
'dmeta.EipDesignerConnectorFileMetaExport'
|
|
47
|
+
]
|
|
43
48
|
})
|
|
44
49
|
)
|
|
45
50
|
export class AppGraphTableWidget extends AppTreeMenuTableWidget {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { OINONE_HOMEPAGE_KEY, translateValueByKey } from '@oinone/kunlun-engine';
|
|
1
|
+
import { ClearCache, OINONE_HOMEPAGE_KEY, translateValueByKey } from '@oinone/kunlun-engine';
|
|
2
2
|
import { SYSTEM_MODULE_NAME } from '@oinone/kunlun-meta';
|
|
3
3
|
import {
|
|
4
4
|
gql,
|
|
@@ -394,7 +394,7 @@ export class LoginWidget extends BaseLoginWidget {
|
|
|
394
394
|
} else {
|
|
395
395
|
const parameters = (await homepageMaybeRuntimeContext(undefined, true)) as any;
|
|
396
396
|
localStorage.setItem(OINONE_HOMEPAGE_KEY, JSON.stringify(parameters));
|
|
397
|
-
|
|
397
|
+
ClearCache.clear();
|
|
398
398
|
this.router.push({
|
|
399
399
|
segments: [
|
|
400
400
|
{
|