提交 4cbcfc19 编写于 作者: ibizdev's avatar ibizdev

chitanda 发布系统代码 [TrainSys,网页端]

上级 565bfcdb
......@@ -12,12 +12,13 @@
},
"dependencies": {
"@ibiz-template/command": "^0.0.1-alpha.26",
"@ibiz-template/controller": "^0.0.1-alpha.26",
"@ibiz-template/controller": "^0.0.1-alpha.28",
"@ibiz-template/core": "^0.0.1-alpha.26",
"@ibiz-template/model": "^0.0.1-alpha.26",
"@ibiz-template/runtime": "^0.0.1-alpha.26",
"@ibiz-template/service": "^0.0.1-alpha.26",
"@ibiz-template/vue-util": "^0.0.1-alpha.26",
"@ibiz-template/model": "^0.0.1-alpha.28",
"@ibiz-template/runtime": "^0.0.1-alpha.28",
"@ibiz-template/service": "^0.0.1-alpha.28",
"@ibiz-template/vue-util": "^0.0.1-alpha.28",
"@ibiz/dynamic-model-api": "^2.0.9",
"dayjs": "^1.11.5",
"lodash-es": "^4.17.21",
"pinia": "^2.0.23",
......@@ -35,6 +36,7 @@
"@types/node": "^18.11.2",
"@types/qs": "^6.9.7",
"@types/ramda": "^0.28.16",
"@types/systemjs": "^6.1.1",
"@typescript-eslint/eslint-plugin": "^5.40.1",
"@typescript-eslint/parser": "^5.40.1",
"@vitejs/plugin-legacy": "^2.2.0",
......
......@@ -4,16 +4,18 @@ specifiers:
'@commitlint/cli': ^17.1.2
'@commitlint/config-conventional': ^17.1.0
'@ibiz-template/command': ^0.0.1-alpha.26
'@ibiz-template/controller': ^0.0.1-alpha.26
'@ibiz-template/controller': ^0.0.1-alpha.28
'@ibiz-template/core': ^0.0.1-alpha.26
'@ibiz-template/model': ^0.0.1-alpha.26
'@ibiz-template/runtime': ^0.0.1-alpha.26
'@ibiz-template/service': ^0.0.1-alpha.26
'@ibiz-template/vue-util': ^0.0.1-alpha.26
'@ibiz-template/model': ^0.0.1-alpha.28
'@ibiz-template/runtime': ^0.0.1-alpha.28
'@ibiz-template/service': ^0.0.1-alpha.28
'@ibiz-template/vue-util': ^0.0.1-alpha.28
'@ibiz/dynamic-model-api': ^2.0.9
'@types/lodash-es': ^4.17.6
'@types/node': ^18.11.2
'@types/qs': ^6.9.7
'@types/ramda': ^0.28.16
'@types/systemjs': ^6.1.1
'@typescript-eslint/eslint-plugin': ^5.40.1
'@typescript-eslint/parser': ^5.40.1
'@vitejs/plugin-legacy': ^2.2.0
......@@ -56,12 +58,13 @@ specifiers:
dependencies:
'@ibiz-template/command': 0.0.1-alpha.26
'@ibiz-template/controller': 0.0.1-alpha.26_zyorgzll33aad44rggrill53py
'@ibiz-template/controller': 0.0.1-alpha.28_cmq4szzde6lcrhelzjag42xqga
'@ibiz-template/core': 0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike
'@ibiz-template/model': 0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike
'@ibiz-template/runtime': 0.0.1-alpha.26_d7srkl5gcm6gojdw7ewx3gfbha
'@ibiz-template/service': 0.0.1-alpha.26_xrcw6p5wduk3rqtw2f2ngefuki
'@ibiz-template/vue-util': 0.0.1-alpha.26_gtvfatrmxyny777tdcl7dqmque
'@ibiz-template/model': 0.0.1-alpha.28_nsblaymxhwib2tpyzxqzaxas74
'@ibiz-template/runtime': 0.0.1-alpha.28_g6fxtb6mle45pozwqev53qkm3e
'@ibiz-template/service': 0.0.1-alpha.28_klwujnrknvxickrp7b6p65yhz4
'@ibiz-template/vue-util': 0.0.1-alpha.28_ekbylytwhawsvfbkkvxcu75qgq
'@ibiz/dynamic-model-api': 2.0.9_qx-util@0.4.3
dayjs: 1.11.5
lodash-es: 4.17.21
pinia: 2.0.23_xjcbg5znturqejtkpd33hx726m
......@@ -79,6 +82,7 @@ devDependencies:
'@types/node': 18.11.2
'@types/qs': 6.9.7
'@types/ramda': 0.28.16
'@types/systemjs': 6.1.1
'@typescript-eslint/eslint-plugin': 5.40.1_ukgdydjtebaxmxfqp5v5ulh64y
'@typescript-eslint/parser': 5.40.1_z4bbprzjrhnsfa24uvmcbu7f5q
'@vitejs/plugin-legacy': 2.2.0_terser@5.15.1+vite@3.1.8
......@@ -655,8 +659,8 @@ packages:
qx-util: 0.4.3
dev: false
/@ibiz-template/controller/0.0.1-alpha.26_zyorgzll33aad44rggrill53py:
resolution: {integrity: sha512-cZzZwnD+eJ5HCAP5jH1yTqWkEmaUUAAO0GmKR+TyvLiy60NUxMhnK/Ogd4R6YzTs9RYkYMz81YnG7+9dnS63Aw==}
/@ibiz-template/controller/0.0.1-alpha.28_cmq4szzde6lcrhelzjag42xqga:
resolution: {integrity: sha512-xEyVpOpvaqYq4S9jiIx4wwdVyMwhVEjX4PMEos0THdMR3sTgFY3KecCUQuZNdJQcXIKOlwV9+rjKO6dM1Itd+g==}
peerDependencies:
'@ibiz-template/core': ^0.0.1-alpha.2
'@ibiz-template/model': ^0.0.1-alpha.2
......@@ -666,9 +670,9 @@ packages:
qx-util: ^0.4.1
dependencies:
'@ibiz-template/core': 0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike
'@ibiz-template/model': 0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike
'@ibiz-template/runtime': 0.0.1-alpha.26_d7srkl5gcm6gojdw7ewx3gfbha
'@ibiz-template/service': 0.0.1-alpha.26_xrcw6p5wduk3rqtw2f2ngefuki
'@ibiz-template/model': 0.0.1-alpha.28_nsblaymxhwib2tpyzxqzaxas74
'@ibiz-template/runtime': 0.0.1-alpha.28_g6fxtb6mle45pozwqev53qkm3e
'@ibiz-template/service': 0.0.1-alpha.28_klwujnrknvxickrp7b6p65yhz4
async-validator: 4.2.5
dayjs: 1.11.5
lodash-es: 4.17.21
......@@ -690,20 +694,21 @@ packages:
- debug
dev: false
/@ibiz-template/model/0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike:
resolution: {integrity: sha512-rJs9T4W21QCYXH6/2q/50FqCyMGoA9omRchk+LzbgY6o9fHgN7g1hcBLHV0uD/+mR4AsmU/Co75kyGewpKWmPw==}
/@ibiz-template/model/0.0.1-alpha.28_nsblaymxhwib2tpyzxqzaxas74:
resolution: {integrity: sha512-O3YMVrBN61Y7jWjbzJ+MruC03bsxykOEnpMJSaHhy1/ZOTKiX+rLQzR9+w4gPis8F83oj5j0gbYsA2XGGFSS0A==}
peerDependencies:
'@ibiz/dynamic-model-api': ^2.0.8
lodash-es: ^4.17.21
qx-util: ^0.4.1
dependencies:
'@ibiz/dynamic-model-api': 2.0.7_qx-util@0.4.3
'@ibiz/dynamic-model-api': 2.0.9_qx-util@0.4.3
lodash-es: 4.17.21
pluralize: 8.0.0
qx-util: 0.4.3
dev: false
/@ibiz-template/runtime/0.0.1-alpha.26_d7srkl5gcm6gojdw7ewx3gfbha:
resolution: {integrity: sha512-ysmwLgTjGGqj5E8aaToXV9CBxPzyOH+iMJhVleH+rf7mNNNJCflql59BxwQcMAksghONw94slkLeFfO3mPLkMA==}
/@ibiz-template/runtime/0.0.1-alpha.28_g6fxtb6mle45pozwqev53qkm3e:
resolution: {integrity: sha512-Dl/3KEceqP2qBSBvnKYyKwHcHhTN/y2opSXWwv0upNmpTNo14Aeps5T7S7EyHgiO8mu59pzVqjoKqwDwN9deXw==}
peerDependencies:
'@ibiz-template/core': ^0.0.1-alpha.2
'@ibiz-template/model': ^0.0.1-alpha.2
......@@ -712,13 +717,13 @@ packages:
dependencies:
'@ibiz-template/command': 0.0.1-alpha.26
'@ibiz-template/core': 0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike
'@ibiz-template/model': 0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike
'@ibiz-template/service': 0.0.1-alpha.26_xrcw6p5wduk3rqtw2f2ngefuki
'@ibiz-template/model': 0.0.1-alpha.28_nsblaymxhwib2tpyzxqzaxas74
'@ibiz-template/service': 0.0.1-alpha.28_klwujnrknvxickrp7b6p65yhz4
qx-util: 0.4.3
dev: false
/@ibiz-template/service/0.0.1-alpha.26_xrcw6p5wduk3rqtw2f2ngefuki:
resolution: {integrity: sha512-PG1yJVbV0z9ZFV3vShv6QoeMlBoQEnyrX6LPH1kYKTzvSXIWLxRC20QBbkmz7GYWE50dOjRfAeDRrdV7hmD14g==}
/@ibiz-template/service/0.0.1-alpha.28_klwujnrknvxickrp7b6p65yhz4:
resolution: {integrity: sha512-SidVMyQatiOVJI/9UJ7vJ8iEWsb2/j6avoxlqBlapax0+DG+si4RgaDoR8A4bqevcx8oyZak5v5gMCZ/AVpjwA==}
peerDependencies:
'@ibiz-template/core': ^0.0.1-alpha.2
'@ibiz-template/model': ^0.0.1-alpha.2
......@@ -726,13 +731,13 @@ packages:
ramda: ^0.28.0
dependencies:
'@ibiz-template/core': 0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike
'@ibiz-template/model': 0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike
'@ibiz-template/model': 0.0.1-alpha.28_nsblaymxhwib2tpyzxqzaxas74
qx-util: 0.4.3
ramda: 0.28.0
dev: false
/@ibiz-template/vue-util/0.0.1-alpha.26_gtvfatrmxyny777tdcl7dqmque:
resolution: {integrity: sha512-1m8e/hDS4vW9pNEx0YE5bvRSN2LEBZRH9UGLi1GkzJVnSf3Mu2IFUemz5wHx9M28/2x+/68WGSRQimUp55HRYQ==}
/@ibiz-template/vue-util/0.0.1-alpha.28_ekbylytwhawsvfbkkvxcu75qgq:
resolution: {integrity: sha512-yJn3qN+V7PfXT4iL4wf8q5ef7T64ZqCMo+RQJQJj2vSsGmTLwphbU1IvYfKTuNhPmiCV4PZPyYYrbuGihKIrbA==}
peerDependencies:
'@ibiz-template/controller': '>=0.0.1-alpha.2'
'@ibiz-template/core': '>=0.0.1-alpha.2'
......@@ -742,17 +747,17 @@ packages:
vue: ^2.7.13
vue-router: ^3.6.5
dependencies:
'@ibiz-template/controller': 0.0.1-alpha.26_zyorgzll33aad44rggrill53py
'@ibiz-template/controller': 0.0.1-alpha.28_cmq4szzde6lcrhelzjag42xqga
'@ibiz-template/core': 0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike
'@ibiz-template/model': 0.0.1-alpha.26_t3cuerihxu3byfhypp2kwscike
'@ibiz-template/model': 0.0.1-alpha.28_nsblaymxhwib2tpyzxqzaxas74
qs: 6.11.0
qx-util: 0.4.3
vue: 2.7.13
vue-router: 3.6.5_vue@2.7.13
dev: false
/@ibiz/dynamic-model-api/2.0.7_qx-util@0.4.3:
resolution: {integrity: sha512-L75Se87Ad4zTnZWPf7VWlkP4N8tnfus1p4+nmBm3KpuZkFtkOxqczERceUyJl+CfJ6D6jiEpY0OpAVj5a71GUQ==}
/@ibiz/dynamic-model-api/2.0.9_qx-util@0.4.3:
resolution: {integrity: sha512-yLybFMWYwBbhcW92rG+WF6uXCyPD+8ZKapErErkx0IMX+whLTkyuY6MNwmgWGO7xEBVlxKW3a6KAp2IL3Ya6eA==}
peerDependencies:
qx-util: '>=0.4.3'
dependencies:
......@@ -919,6 +924,10 @@ packages:
resolution: {integrity: sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==}
dev: true
/@types/systemjs/6.1.1:
resolution: {integrity: sha512-d1M6eDKBGWx7RbYy295VEFoOF9YDJkPI959QYnmzcmeaV+SP4D0xV7dEh3sN5XF3GvO3PhGzm+17Z598nvHQuQ==}
dev: true
/@typescript-eslint/eslint-plugin/5.40.1_ukgdydjtebaxmxfqp5v5ulh64y:
resolution: {integrity: sha512-FsWboKkWdytGiXT5O1/R9j37YgcjO8MKHSUmWnIEjVaz0krHkplPnYi7mwdb+5+cs0toFNQb0HIrN7zONdIEWg==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
......
......@@ -73,7 +73,6 @@ export const IBizPickerDropdown = defineComponent({
(newVal, oldVal) => {
if (newVal !== oldVal) {
refValue.value = newVal;
console.log(`值项:${newVal}`, oldVal);
}
},
{ immediate: true, deep: true },
......@@ -104,19 +103,28 @@ export const IBizPickerDropdown = defineComponent({
}
};
// 在搜索中时,再次触发搜索记录搜索值,等待上次搜索触发完成后再次搜索
let waitQuery: string | null = null;
// 搜索
const onSearch = async (query: string) => {
if (c.model.appDataEntity) {
if (c.model.appDataEntity && loading.value === false) {
loading.value = true;
try {
const res = await c.getServiceData(query, props.data!);
loading.value = false;
if (res) {
items.value = res.data as IData[];
}
} catch (error) {
} finally {
loading.value = false;
if (waitQuery != null) {
const selfQuery = waitQuery;
waitQuery = null;
await onSearch(selfQuery);
}
}
} else {
waitQuery = query;
}
};
......@@ -172,9 +180,9 @@ export const IBizPickerDropdown = defineComponent({
filterable
allow-clear
clearable
remote-method={this.queryChange}
loading={this.loading}
placeholder={this.c.placeHolder}
on-on-query-change={this.queryChange}
on-on-open-change={this.onSelectOpen}
on-on-change={this.onSelect}
on-on-clear={this.onClear}
......
......@@ -51,7 +51,7 @@ export const WFDynaActionView = defineComponent({
>
{this.c.complete && (
<edit-form-control
modelData={this.c.model.forms.get('form')}
modelData={this.c.activeForm}
context={this.c.context}
params={this.c.params}
on-neuronInit={this.c.nerve.onNeuronInit('form')}
......
......@@ -51,7 +51,7 @@ export const WFDynaStartView = defineComponent({
>
{this.c.complete && (
<edit-form-control
modelData={this.c.model.forms.get('form')}
modelData={this.c.activeForm}
context={this.c.context}
params={this.c.params}
on-neuronInit={this.c.nerve.onNeuronInit('form')}
......
import { DashboardController } from '@ibiz-template/controller';
import { IBizContext } from '@ibiz-template/core';
import {
DashboardModel,
......@@ -5,7 +6,7 @@ import {
PortletPartModel,
} from '@ibiz-template/model';
import { useDashboardController, useNamespace } from '@ibiz-template/vue-util';
import { defineComponent, getCurrentInstance, PropType } from 'vue';
import { defineComponent, getCurrentInstance, h, PropType, VNode } from 'vue';
/**
* 根据类型绘制数据看板成员
......@@ -15,17 +16,32 @@ import { defineComponent, getCurrentInstance, PropType } from 'vue';
* @param {PortletPartModel} model 模型
* @param {IData} opts 额外参数
*/
function renderPortletByType(model: PortletPartModel, opts?: IData) {
function renderPortletByType(
model: PortletPartModel,
c: DashboardController,
opts?: IData,
): VNode {
const provider = c.providers[model.source.name];
// 绘制容器
if (model.source.portletType === 'CONTAINER') {
const container = model as PortletContainerModel;
return (
<portlet-container modelData={container}>
{container.children.map(child => renderPortletByType(child, opts))}
</portlet-container>
return h(
provider.compName,
{
props: {
modelData: model,
},
key: model.id,
},
container.children.map(child => renderPortletByType(child, c, opts)),
);
}
return <portlet-part modelData={model}></portlet-part>;
// 绘制门户部件
return h(provider.compName, {
props: {
modelData: model,
},
});
}
export const DashboardControl = defineComponent({
......@@ -69,7 +85,7 @@ export const DashboardControl = defineComponent({
layoutPos={child.source.getPSLayoutPos()}
modelData={child}
>
{renderPortletByType(child)}
{renderPortletByType(child, this.c)}
</app-col>
);
})}
......
......@@ -67,9 +67,6 @@ export const FormDRUIPart = defineComponent({
neuronInit: this.onNeuronInit,
},
})}
{this.controller.showMask ? (
<div class={this.ns.e('mask')}>请先保存主数据</div>
) : null}
</div>
);
},
......
......@@ -36,3 +36,14 @@ export function presetFormDetailProvider(): void {
// 表单分页面板
formDetail.register('TABPAGE', new FormTabPageProvider());
}
export {
FormButtonProvider,
FormDRUIPartProvider,
FormGroupPanelProvider,
FormItemProvider,
FormPageProvider,
FormRawItemProvider,
FormTabPageProvider,
FormTabPanelProvider,
};
import { presetEditorProvider } from './editor';
import { presetFormDetailProvider } from './form-detail';
import { presetPortletPartProvider } from './portlet-part';
export * from './editor';
export * from './form-detail';
export * from './portlet-part';
/**
* 注册所有预置的适配器
......@@ -14,4 +16,5 @@ export * from './form-detail';
export function presetAllProviders(): void {
presetEditorProvider();
presetFormDetailProvider();
presetPortletPartProvider();
}
import { PortletActionBarProvider } from './portlet-action-bar-provider';
import { PortletAppmenuProvider } from './portlet-appmenu-provider';
import { PortletChartProvider } from './portlet-chart-provider';
import { PortletContainerProvider } from './portlet-container-provider';
import { PortletCustomProvider } from './portlet-custom-provider';
import { PortletHtmlProvider } from './portlet-html-provider';
import { PortletListProvider } from './portlet-list-provider';
import { PortletRawItemProvider } from './portlet-raw-item-provider';
import { PortletToolbarProvider } from './portlet-toolbar-provider';
import { PortletViewProvider } from './portlet-view-provider';
/**
* 预置默认的表单成员适配器
*
* @author lxm
* @date 2022-09-19 22:09:50
* @export
*/
export function presetPortletPartProvider(): void {
const { portletPart } = ibiz.register;
if (!portletPart) {
return;
}
// 实体列表
portletPart.register('LIST', new PortletListProvider());
// 实体图表
portletPart.register('CHART', new PortletChartProvider());
// 系统视图
portletPart.register('VIEW', new PortletViewProvider());
// 网页部件
portletPart.register('HTML', new PortletHtmlProvider());
// 工具栏
portletPart.register('TOOLBAR', new PortletToolbarProvider());
// 操作栏
portletPart.register('ACTIONBAR', new PortletActionBarProvider());
// 自定义
portletPart.register('CUSTOM', new PortletCustomProvider());
// 快捷菜单
portletPart.register('APPMENU', new PortletAppmenuProvider());
// 直接内容
portletPart.register('RAWITEM', new PortletRawItemProvider());
// 布局容器
portletPart.register('CONTAINER', new PortletContainerProvider());
}
export {
PortletActionBarProvider,
PortletAppmenuProvider,
PortletChartProvider,
PortletContainerProvider,
PortletCustomProvider,
PortletHtmlProvider,
PortletListProvider,
PortletRawItemProvider,
PortletToolbarProvider,
PortletViewProvider,
};
import { IPortletPartProvider } from '@ibiz-template/controller';
/**
* 数据看板成员操作栏适配器
*
* @author lxm
* @date 2022-10-19 15:10:44
* @export
* @class PortletActionBarProvider
*/
export class PortletActionBarProvider implements IPortletPartProvider {
compName: string = 'PortletPart';
}
import { IPortletPartProvider } from '@ibiz-template/controller';
/**
* 数据看板成员快捷菜单适配器
*
* @author lxm
* @date 2022-10-19 15:10:44
* @export
* @class PortletAppmenuProvider
*/
export class PortletAppmenuProvider implements IPortletPartProvider {
compName: string = 'PortletPart';
}
import { IPortletPartProvider } from '@ibiz-template/controller';
/**
* 数据看板成员实体图表适配器
*
* @author lxm
* @date 2022-10-19 15:10:44
* @export
* @class PortletChartProvider
*/
export class PortletChartProvider implements IPortletPartProvider {
compName: string = 'PortletPart';
}
import { IPortletPartProvider } from '@ibiz-template/controller';
/**
* 数据看板容器适配器
*
* @author lxm
* @date 2022-10-19 15:10:44
* @export
* @class PortletListProvider
*/
export class PortletContainerProvider implements IPortletPartProvider {
compName: string = 'PortletContainer';
}
import { IPortletPartProvider } from '@ibiz-template/controller';
/**
* 数据看板成员自定义适配器
*
* @author lxm
* @date 2022-10-19 15:10:44
* @export
* @class PortletCustomProvider
*/
export class PortletCustomProvider implements IPortletPartProvider {
compName: string = 'PortletPart';
}
import { IPortletPartProvider } from '@ibiz-template/controller';
/**
* 数据看板成员网页部件适配器
*
* @author lxm
* @date 2022-10-19 15:10:44
* @export
* @class PortletHtmlProvider
*/
export class PortletHtmlProvider implements IPortletPartProvider {
compName: string = 'PortletPart';
}
import { IPortletPartProvider } from '@ibiz-template/controller';
/**
* 数据看板成员实体列表适配器
*
* @author lxm
* @date 2022-10-19 15:10:44
* @export
* @class PortletListProvider
*/
export class PortletListProvider implements IPortletPartProvider {
compName: string = 'PortletPart';
}
import { IPortletPartProvider } from '@ibiz-template/controller';
/**
* 数据看板成员直接内容适配器
*
* @author lxm
* @date 2022-10-19 15:10:44
* @export
* @class PortletRawItemProvider
*/
export class PortletRawItemProvider implements IPortletPartProvider {
compName: string = 'PortletPart';
}
import { IPortletPartProvider } from '@ibiz-template/controller';
/**
* 数据看板成员工具栏适配器
*
* @author lxm
* @date 2022-10-19 15:10:44
* @export
* @class PortletToolbarProvider
*/
export class PortletToolbarProvider implements IPortletPartProvider {
compName: string = 'PortletPart';
}
import { IPortletPartProvider } from '@ibiz-template/controller';
/**
* 数据看板成员系统视图适配器
*
* @author lxm
* @date 2022-10-19 15:10:44
* @export
* @class PortletViewProvider
*/
export class PortletViewProvider implements IPortletPartProvider {
compName: string = 'PortletPart';
}
......@@ -4,11 +4,4 @@
position: relative;
width: 100%;
height: 100%;
@include e(mask) {
width: getCssVar('form-druipart', 'mask-width');
height: getCssVar('form-druipart', 'mask-height');
@include flex(row, center, center);
@include mask(rgba($color: #000, $alpha: 60%));
}
}
......@@ -36,14 +36,14 @@ export default defineComponent({
const app = modelService.app;
const entity = app.getAllPSAppDataEntities()!.find(item => {
return item.refM.name === upperDeName;
return (item.name || item.refM.name) === upperDeName;
});
if (!entity) {
throw new RuntimeError(`未找到指定实体: ${deName}`);
}
const deCodeName: string = entity.refM.codeName;
const deCodeName: string = entity.codeName || entity.refM.codeName;
params[deCodeName.toLowerCase()] = params[deName.toLowerCase()];
......
......@@ -11,6 +11,8 @@ function IBizVitePlugin(): Plugin[] {
const map = {
'node_modules/qx-util/dist/umd/qx-util.umd.js':
'dist/extras/js/qx-util.min.js',
'node_modules/@ibiz/dynamic-model-api/dist/ibiz-dynamic-model-api.system.min.js':
'dist/extras/js/ibiz-dynamic-model-api.system.min.js',
};
// 模板底包
const templatePackages = [
......
......@@ -492,10 +492,10 @@
dependencies:
qx-util "0.4.3"
"@ibiz-template/controller@^0.0.1-alpha.26":
version "0.0.1-alpha.26"
resolved "https://registry.yarnpkg.com/@ibiz-template/controller/-/controller-0.0.1-alpha.26.tgz#e351c60258eb945a6995b1b88050882677ea259f"
integrity sha512-cZzZwnD+eJ5HCAP5jH1yTqWkEmaUUAAO0GmKR+TyvLiy60NUxMhnK/Ogd4R6YzTs9RYkYMz81YnG7+9dnS63Aw==
"@ibiz-template/controller@^0.0.1-alpha.28":
version "0.0.1-alpha.28"
resolved "https://registry.yarnpkg.com/@ibiz-template/controller/-/controller-0.0.1-alpha.28.tgz#0b4b964d00d685a81a0dbedac998f1906eb07ce8"
integrity sha512-xEyVpOpvaqYq4S9jiIx4wwdVyMwhVEjX4PMEos0THdMR3sTgFY3KecCUQuZNdJQcXIKOlwV9+rjKO6dM1Itd+g==
dependencies:
async-validator "^4.2.5"
dayjs "^1.11.5"
......@@ -509,35 +509,35 @@
pluralize "^8.0.0"
qs "^6.11.0"
"@ibiz-template/model@^0.0.1-alpha.26":
version "0.0.1-alpha.26"
resolved "https://registry.yarnpkg.com/@ibiz-template/model/-/model-0.0.1-alpha.26.tgz#70fadb1600140b78e335c00a76ce3421f8d04a34"
integrity sha512-rJs9T4W21QCYXH6/2q/50FqCyMGoA9omRchk+LzbgY6o9fHgN7g1hcBLHV0uD/+mR4AsmU/Co75kyGewpKWmPw==
"@ibiz-template/model@^0.0.1-alpha.28":
version "0.0.1-alpha.28"
resolved "https://registry.yarnpkg.com/@ibiz-template/model/-/model-0.0.1-alpha.28.tgz#37e0d57ffa8d973717be0f28fe72af924ecad275"
integrity sha512-O3YMVrBN61Y7jWjbzJ+MruC03bsxykOEnpMJSaHhy1/ZOTKiX+rLQzR9+w4gPis8F83oj5j0gbYsA2XGGFSS0A==
dependencies:
"@ibiz/dynamic-model-api" "^2.0.7"
"@ibiz/dynamic-model-api" "^2.0.9"
pluralize "^8.0.0"
"@ibiz-template/runtime@^0.0.1-alpha.26":
version "0.0.1-alpha.26"
resolved "https://registry.yarnpkg.com/@ibiz-template/runtime/-/runtime-0.0.1-alpha.26.tgz#8d8f79987bbb53c7972d06fe4fd7fd0cd92543b0"
integrity sha512-ysmwLgTjGGqj5E8aaToXV9CBxPzyOH+iMJhVleH+rf7mNNNJCflql59BxwQcMAksghONw94slkLeFfO3mPLkMA==
"@ibiz-template/runtime@^0.0.1-alpha.28":
version "0.0.1-alpha.28"
resolved "https://registry.yarnpkg.com/@ibiz-template/runtime/-/runtime-0.0.1-alpha.28.tgz#be37ccc5c99c0fc92367337048731efc967a55bc"
integrity sha512-Dl/3KEceqP2qBSBvnKYyKwHcHhTN/y2opSXWwv0upNmpTNo14Aeps5T7S7EyHgiO8mu59pzVqjoKqwDwN9deXw==
dependencies:
"@ibiz-template/command" "^0.0.1-alpha.26"
"@ibiz-template/service@^0.0.1-alpha.26":
version "0.0.1-alpha.26"
resolved "https://registry.yarnpkg.com/@ibiz-template/service/-/service-0.0.1-alpha.26.tgz#17868895c57710d315653eb50d41d6a9f557faf2"
integrity sha512-PG1yJVbV0z9ZFV3vShv6QoeMlBoQEnyrX6LPH1kYKTzvSXIWLxRC20QBbkmz7GYWE50dOjRfAeDRrdV7hmD14g==
"@ibiz-template/service@^0.0.1-alpha.28":
version "0.0.1-alpha.28"
resolved "https://registry.yarnpkg.com/@ibiz-template/service/-/service-0.0.1-alpha.28.tgz#7be5a283b083554410535e9a681e87df8321a1d0"
integrity sha512-SidVMyQatiOVJI/9UJ7vJ8iEWsb2/j6avoxlqBlapax0+DG+si4RgaDoR8A4bqevcx8oyZak5v5gMCZ/AVpjwA==
"@ibiz-template/vue-util@^0.0.1-alpha.26":
version "0.0.1-alpha.26"
resolved "https://registry.yarnpkg.com/@ibiz-template/vue-util/-/vue-util-0.0.1-alpha.26.tgz#c38d4e3e64fddf3d3032dc07e92b99fb294b5c85"
integrity sha512-1m8e/hDS4vW9pNEx0YE5bvRSN2LEBZRH9UGLi1GkzJVnSf3Mu2IFUemz5wHx9M28/2x+/68WGSRQimUp55HRYQ==
"@ibiz-template/vue-util@^0.0.1-alpha.28":
version "0.0.1-alpha.28"
resolved "https://registry.yarnpkg.com/@ibiz-template/vue-util/-/vue-util-0.0.1-alpha.28.tgz#c0496a4167ea6be09d358ec842d563207b2acac1"
integrity sha512-yJn3qN+V7PfXT4iL4wf8q5ef7T64ZqCMo+RQJQJj2vSsGmTLwphbU1IvYfKTuNhPmiCV4PZPyYYrbuGihKIrbA==
"@ibiz/dynamic-model-api@^2.0.7":
version "2.0.7"
resolved "https://registry.yarnpkg.com/@ibiz/dynamic-model-api/-/dynamic-model-api-2.0.7.tgz#7857257bff41f186af04bc119177f93abcc6343a"
integrity sha512-L75Se87Ad4zTnZWPf7VWlkP4N8tnfus1p4+nmBm3KpuZkFtkOxqczERceUyJl+CfJ6D6jiEpY0OpAVj5a71GUQ==
"@ibiz/dynamic-model-api@^2.0.9":
version "2.0.9"
resolved "https://registry.yarnpkg.com/@ibiz/dynamic-model-api/-/dynamic-model-api-2.0.9.tgz#43f62596cbef33abe7b54f3c5e4ff24cba611d22"
integrity sha512-yLybFMWYwBbhcW92rG+WF6uXCyPD+8ZKapErErkx0IMX+whLTkyuY6MNwmgWGO7xEBVlxKW3a6KAp2IL3Ya6eA==
"@jridgewell/gen-mapping@^0.1.0":
version "0.1.1"
......@@ -721,6 +721,11 @@
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c"
integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==
"@types/systemjs@^6.1.1":
version "6.1.1"
resolved "https://registry.yarnpkg.com/@types/systemjs/-/systemjs-6.1.1.tgz#eae17f2a080e867d01a2dd614f524ab227cf5a41"
integrity sha512-d1M6eDKBGWx7RbYy295VEFoOF9YDJkPI959QYnmzcmeaV+SP4D0xV7dEh3sN5XF3GvO3PhGzm+17Z598nvHQuQ==
"@typescript-eslint/eslint-plugin@^5.40.1":
version "5.40.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.1.tgz#3203a6ff396b1194083faaa6e5110c401201d7d5"
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册