Skip to content

I
ibzdst
提交 194136ef 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zhouweidong 发布系统代码 [ibz-dst，应用]

上级 23fc8007
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 3540 行增加 和 40 行删除
app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts
浏览文件 @ 194136ef
......@@ -43,10 +43,12 @@ function getLocaleResourceBase(){
title: commonLogic.appcommonhandle("模型表格视图",null),
},
},
main_form: {
fileupload_form: {
details: {
group1: commonLogic.appcommonhandle("模型基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
group2: commonLogic.appcommonhandle("操作信息",null),
formpage2: commonLogic.appcommonhandle("其它",null),
srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("标识",null),
......@@ -55,23 +57,18 @@ function getLocaleResourceBase(){
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
modelname: commonLogic.appcommonhandle("名称",null),
codename: commonLogic.appcommonhandle("代码名称",null),
materializedview: commonLogic.appcommonhandle("物化视图",null),
refreshtime: commonLogic.appcommonhandle("刷新时间",null),
modelcfg: commonLogic.appcommonhandle("配置",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
formitem: commonLogic.appcommonhandle("文件",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
modelid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
},
},
fileupload_form: {
main_form: {
details: {
group1: commonLogic.appcommonhandle("模型基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
group2: commonLogic.appcommonhandle("操作信息",null),
formpage2: commonLogic.appcommonhandle("其它",null),
srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("标识",null),
......@@ -80,9 +77,12 @@ function getLocaleResourceBase(){
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
formitem: commonLogic.appcommonhandle("文件",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
modelname: commonLogic.appcommonhandle("名称",null),
codename: commonLogic.appcommonhandle("代码名称",null),
materializedview: commonLogic.appcommonhandle("物化视图",null),
refreshtime: commonLogic.appcommonhandle("刷新时间",null),
modelcfg: commonLogic.appcommonhandle("配置",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
modelid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
......@@ -108,6 +108,10 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
浏览文件 @ 194136ef
......@@ -43,10 +43,12 @@ function getLocaleResourceBase(){
title: commonLogic.appcommonhandle("模型表格视图",null),
},
},
main_form: {
fileupload_form: {
details: {
group1: commonLogic.appcommonhandle("模型基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
group2: commonLogic.appcommonhandle("操作信息",null),
formpage2: commonLogic.appcommonhandle("其它",null),
srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("标识",null),
......@@ -55,23 +57,18 @@ function getLocaleResourceBase(){
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
modelname: commonLogic.appcommonhandle("名称",null),
codename: commonLogic.appcommonhandle("代码名称",null),
materializedview: commonLogic.appcommonhandle("物化视图",null),
refreshtime: commonLogic.appcommonhandle("刷新时间",null),
modelcfg: commonLogic.appcommonhandle("配置",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
formitem: commonLogic.appcommonhandle("文件",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
modelid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
},
},
fileupload_form: {
main_form: {
details: {
group1: commonLogic.appcommonhandle("模型基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
group2: commonLogic.appcommonhandle("操作信息",null),
formpage2: commonLogic.appcommonhandle("其它",null),
srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("标识",null),
......@@ -80,9 +77,12 @@ function getLocaleResourceBase(){
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
formitem: commonLogic.appcommonhandle("文件",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
modelname: commonLogic.appcommonhandle("名称",null),
codename: commonLogic.appcommonhandle("代码名称",null),
materializedview: commonLogic.appcommonhandle("物化视图",null),
refreshtime: commonLogic.appcommonhandle("刷新时间",null),
modelcfg: commonLogic.appcommonhandle("配置",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
modelid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
......@@ -108,6 +108,10 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
......
app_web/src/pages/lite/dst-index/page-register.ts
浏览文件 @ 194136ef
......@@ -38,11 +38,12 @@ export const PageComponents = {
Vue.component('rule-item-pickup-grid-view', () => import('@pages/rule/rule-item-pickup-grid-view/rule-item-pickup-grid-view.vue'));
Vue.component('meta-entity-edit-view', () => import('@pages/lite/meta-entity-edit-view/meta-entity-edit-view.vue'));
Vue.component('rule-item-pickup-view', () => import('@pages/rule/rule-item-pickup-view/rule-item-pickup-view.vue'));
Vue.component('meta-model-file-upload-option-view', () => import('@pages/lite/meta-model-file-upload-option-view/meta-model-file-upload-option-view.vue'));
Vue.component('dst-data-source-grid-view', () => import('@pages/lite/dst-data-source-grid-view/dst-data-source-grid-view.vue'));
Vue.component('meta-field-edit-grid-view', () => import('@pages/lite/meta-field-edit-grid-view/meta-field-edit-grid-view.vue'));
Vue.component('dametric-edit-view', () => import('@pages/analysis/dametric-edit-view/dametric-edit-view.vue'));
Vue.component('exec-result-edit-view', () => import('@pages/rule/exec-result-edit-view/exec-result-edit-view.vue'));
Vue.component('meta-entity-grid-view', () => import('@pages/lite/meta-entity-grid-view/meta-entity-grid-view.vue'));
Vue.component('dachart-edit-view', () => import('@pages/analysis/dachart-edit-view/dachart-edit-view.vue'));
Vue.component('meta-entity-grid-view', () => import('@pages/lite/meta-entity-grid-view/meta-entity-grid-view.vue'));
}
};
\ No newline at end of file
app_web/src/pages/lite/dst-index/router.ts
浏览文件 @ 194136ef
......@@ -906,6 +906,20 @@ const router = new Router({
},
component: () => import('@pages/rule/rule-item-pickup-view/rule-item-pickup-view.vue'),
},
{
path: 'metamodels/:metamodel?/fileuploadoptionview/:fileuploadoptionview?',
meta: {
caption: 'entities.metamodel.views.fileuploadoptionview.caption',
info:'',
parameters: [
{ pathName: 'dstindex', parameterName: 'dstindex' },
{ pathName: 'metamodels', parameterName: 'metamodel' },
{ pathName: 'fileuploadoptionview', parameterName: 'fileuploadoptionview' },
],
requireAuth: true,
},
component: () => import('@pages/lite/meta-model-file-upload-option-view/meta-model-file-upload-option-view.vue'),
},
{
path: 'dstdatasources/:dstdatasource?/gridview/:gridview?',
meta: {
......@@ -1009,27 +1023,27 @@ const router = new Router({
component: () => import('@pages/rule/exec-result-edit-view/exec-result-edit-view.vue'),
},
{
path: 'dstsystems/:dstsystem?/metaentities/:metaentity?/gridview/:gridview?',
path: 'dacharts/:dachart?/editview/:editview?',
meta: {
caption: 'entities.metaentity.views.gridview.caption',
caption: 'entities.dachart.views.editview.caption',
info:'',
parameters: [
{ pathName: 'dstindex', parameterName: 'dstindex' },
{ pathName: 'dstsystems', parameterName: 'dstsystem' },
{ pathName: 'metaentities', parameterName: 'metaentity' },
{ pathName: 'gridview', parameterName: 'gridview' },
{ pathName: 'dacharts', parameterName: 'dachart' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/lite/meta-entity-grid-view/meta-entity-grid-view.vue'),
component: () => import('@pages/analysis/dachart-edit-view/dachart-edit-view.vue'),
},
{
path: 'metaentities/:metaentity?/gridview/:gridview?',
path: 'dstsystems/:dstsystem?/metaentities/:metaentity?/gridview/:gridview?',
meta: {
caption: 'entities.metaentity.views.gridview.caption',
info:'',
parameters: [
{ pathName: 'dstindex', parameterName: 'dstindex' },
{ pathName: 'dstsystems', parameterName: 'dstsystem' },
{ pathName: 'metaentities', parameterName: 'metaentity' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
......@@ -1038,18 +1052,18 @@ const router = new Router({
component: () => import('@pages/lite/meta-entity-grid-view/meta-entity-grid-view.vue'),
},
{
path: 'dacharts/:dachart?/editview/:editview?',
path: 'metaentities/:metaentity?/gridview/:gridview?',
meta: {
caption: 'entities.dachart.views.editview.caption',
caption: 'entities.metaentity.views.gridview.caption',
info:'',
parameters: [
{ pathName: 'dstindex', parameterName: 'dstindex' },
{ pathName: 'dacharts', parameterName: 'dachart' },
{ pathName: 'editview', parameterName: 'editview' },
{ pathName: 'metaentities', parameterName: 'metaentity' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/analysis/dachart-edit-view/dachart-edit-view.vue'),
component: () => import('@pages/lite/meta-entity-grid-view/meta-entity-grid-view.vue'),
},
...indexRoutes,
],
......@@ -1321,6 +1335,19 @@ const router = new Router({
},
component: () => import('@pages/analysis/dametric-grid-view/dametric-grid-view.vue'),
},
{
path: '/metamodels/:metamodel?/fileuploadoptionview/:fileuploadoptionview?',
meta: {
caption: 'entities.metamodel.views.fileuploadoptionview.caption',
info:'',
parameters: [
{ pathName: 'metamodels', parameterName: 'metamodel' },
{ pathName: 'fileuploadoptionview', parameterName: 'fileuploadoptionview' },
],
requireAuth: true,
},
component: () => import('@pages/lite/meta-model-file-upload-option-view/meta-model-file-upload-option-view.vue'),
},
{
path: '/ruleitems/:ruleitem?/pickupgridview/:pickupgridview?',
meta: {
......
app_web/src/pages/lite/meta-model-file-upload-option-view/meta-model-file-upload-option-view.less 0 → 100644
浏览文件 @ 194136ef
.meta-model-file-upload-option-view{
position: relative;
}
.app-modal{
.view-container {
.view-card {
.ivu-card-body {
.content-container{
height: calc(100% - 64px);
.ivu-badge{
.ivu-badge-count{
top: -5px;
}
}
}
}
}
}
}
\ No newline at end of file
app_web/src/pages/lite/meta-model-file-upload-option-view/meta-model-file-upload-option-view.vue 0 → 100644
浏览文件 @ 194136ef
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import MetaModelFileUploadOptionViewBase from './meta-model-file-upload-option-view-base.vue';
import view_form from '@widgets/meta-model/fileupload-form/fileupload-form.vue';
@Component({
components: {
view_form,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class MetaModelFileUploadOptionView extends MetaModelFileUploadOptionViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue
浏览文件 @ 194136ef
......@@ -12,6 +12,13 @@
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;padding-left: 24px' placeholder="名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
<i class=''></i>
......@@ -377,6 +384,8 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridView
*/
public toolBarModels: any = {
tbitem1_import: { name: 'tbitem1_import', actiontarget: 'NONE', caption: '模型导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'import', target: 'NONE' } },
tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
......@@ -755,6 +764,9 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridViewBase
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem1_import')) {
this.toolbar_tbitem1_import_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_export')) {
this.toolbar_tbitem1_export_click(null, '', $event2);
}
......@@ -900,6 +912,35 @@ export default class MetaModelGridViewBase extends Vue {
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
}
/**
* 逻辑事件
*
......
app_web/src/store/modules/view-action/state.ts
浏览文件 @ 194136ef
......@@ -168,6 +168,15 @@ export const viewstate: any = {
'b0fc4bae7655b93b1e554b05f06029f0',
],
},
{
viewtag: '35ffea078130f40ec781f57b0103fb0d',
viewmodule: 'lite',
viewname: 'MetaModelFileUploadOptionView',
viewaction: '',
viewdatachange: false,
refviews: [
],
},
{
viewtag: '39a2ac0f7cdc72d675c9829f56c92dd7',
viewmodule: 'rule',
......@@ -436,6 +445,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'35ffea078130f40ec781f57b0103fb0d',
'62c99660031ae1998bb8c9c95fe4661a',
],
},
......
app_web/src/uiservice/meta-model/meta-model-ui-service-base.ts
浏览文件 @ 194136ef
......@@ -121,6 +121,51 @@ export default class MetaModelUIServiceBase extends UIService {
public initDeMainStateOPPrivsMap(){
}
/**
* 模型导入
*
* @param {any[]} args 当前数据
* @param {any} context 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @param {*} [srfParentDeName] 父实体名称
* @returns {Promise<any>}
*/
public async MetaModel_import(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
let data: any = {};
let parentContext:any = {};
let parentViewParam:any = {};
const _this: any = actionContext;
const _args: any[] = Util.deepCopy(args);
const actionTarget: string | null = 'NONE';
if(_this.context){
parentContext = _this.context;
}
if(_this.viewparams){
parentViewParam = _this.viewparams;
}
context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
context = Object.assign({},actionContext.context,context);
let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
Object.assign(data,parentObj);
Object.assign(context,parentObj);
let deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'metamodels', parameterName: 'metamodel' },
{ pathName: 'fileuploadoptionview', parameterName: 'fileuploadoptionview' },
];
const openIndexViewTab = (data: any) => {
const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
actionContext.$router.push(routePath);
return null;
}
openIndexViewTab(data);
}
/**
* 模型导出
*
......
app_web/src/widgets/meta-model/fileupload-form/fileupload-form-model.ts 0 → 100644
浏览文件 @ 194136ef
/**
* Fileupload 部件模型
*
* @export
* @class FileuploadModel
*/
export default class FileuploadModel {
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof FileuploadModel
*/
public getDataItems(): any[] {
return [
{
name: 'srfwfmemo',
prop: 'srfwfmemo',
dataType: 'TEXT',
},
// 前端新增修改标识，新增为"0",修改为"1"或未设值
{
name: 'srffrontuf',
prop: 'srffrontuf',
dataType: 'TEXT',
},
{
name: 'srfupdatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{
name: 'srforikey',
},
{
name: 'srfkey',
prop: 'id',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
prop: 'name',
dataType: 'TEXT',
},
{
name: 'srftempmode',
},
{
name: 'srfuf',
},
{
name: 'srfdeid',
},
{
name: 'srfsourcekey',
},
{
name: 'formitem',
dataType:'FORMITEM',
},
{
name: 'createdate',
prop: 'createdate',
dataType: 'DATETIME',
},
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{
name: 'modelid',
prop: 'id',
dataType: 'TEXT',
},
{
name: 'metamodel',
prop: 'id',
dataType: 'FONTKEY',
},
]
}
}
\ No newline at end of file
app_web/src/widgets/meta-model/fileupload-form/fileupload-form.less 0 → 100644
浏览文件 @ 194136ef
.ivu-tabs-no-animation>.ivu-tabs-content{
padding: 0 16px;
}
.ivu-card-head{
padding: 14px 0;
}
.app-form {
overflow: auto;
padding: 6px;
> .ivu-row {
> .ivu-tabs {
height: 100%;
display: flex;
flex-direction: column;
> .ivu-tabs-content {
flex-grow: 1;
overflow: auto;
> .ivu-tabs-tabpane {
height: 100%;
}
}
}
}
}
.app-tabpanel-flex {
height: 100%;
> .ivu-tabs-content {
height: calc(100% - 52px);
> .ivu-tabs-tabpane {
height: 100%;
}
}
}
.app-form {
>.ivu-row:nth-child(2) {
>.ivu-col:nth-child(1) {
>.ivu-row.app-form-group.app-group-hiddden-caption:nth-child(1) {
margin-top: 12px;
}
}
}
}
.app-form{
// 表单行间距
.app-form-item{
margin-bottom: 20px;
}
// 表单按钮margin
.app-form-button{
margin:0 6px;
}
}
// this is less
app_web/src/widgets/meta-model/fileupload-form/fileupload-form.vue 0 → 100644
浏览文件 @ 194136ef
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import FileuploadBase from './fileupload-form-base.vue';
@Component({
components: {
}
})
export default class Fileupload extends FileuploadBase {
}
</script>
\ No newline at end of file
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 194136ef
......@@ -328,7 +328,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet author="root" id="tab-meta_model-34-12">
<changeSet author="root" id="tab-meta_model-37-12">
<createTable tableName="IBZMODEL">
<column name="MODELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或