Skip to content

I
ibzdict
提交 60df0e53 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 259c28c1
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 263 行增加 和 258 行删除
app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_en_US.ts
浏览文件 @ 60df0e53
......@@ -2,6 +2,7 @@
export default {
fields: {
id: "标识",
code: "代码",
name: "名称",
group: "分组",
memo: "备注",
......@@ -39,17 +40,18 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
cid: "标识",
ccode: "代码",
cname: "名称",
cgroup: "分组",
memo: "备注",
cid: "标识",
},
uiactions: {
},
},
main_grid: {
columns: {
cid: "标识",
ccode: "代码",
cname: "名称",
cgroup: "分组",
memo: "备注",
......@@ -61,9 +63,9 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_cid_like: "标识(文本包含(%))",
n_cname_like: "名称(文本包含(%))",
n_cgroup_like: "分组(文本包含(%))",
n_ccode_like: "代码",
n_cname_like: "名称",
n_cgroup_like: "分组",
},
uiactions: {
},
......@@ -121,10 +123,6 @@ export default {
caption: "Filter",
tip: "Filter",
},
tbitem18: {
caption: "Help",
tip: "Help",
},
},
editviewtoolbar_toolbar: {
tbitem1: {
......
app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_zh_CN.ts
浏览文件 @ 60df0e53
export default {
fields: {
id: "标识",
code: "代码",
name: "名称",
group: "分组",
memo: "备注",
......@@ -38,17 +39,18 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
cid: "标识",
ccode: "代码",
cname: "名称",
cgroup: "分组",
memo: "备注",
cid: "标识",
},
uiactions: {
},
},
main_grid: {
columns: {
cid: "标识",
ccode: "代码",
cname: "名称",
cgroup: "分组",
memo: "备注",
......@@ -60,9 +62,9 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_cid_like: "标识(文本包含(%))",
n_cname_like: "名称(文本包含(%))",
n_cgroup_like: "分组(文本包含(%))",
n_ccode_like: "代码",
n_cname_like: "名称",
n_cgroup_like: "分组",
},
uiactions: {
},
......@@ -120,10 +122,6 @@ export default {
caption: "过滤",
tip: "过滤",
},
tbitem18: {
caption: "帮助",
tip: "帮助",
},
},
editviewtoolbar_toolbar: {
tbitem1: {
......
app_web/src/locale/lanres/entities/dict-option/dict-option_en_US.ts
浏览文件 @ 60df0e53
......@@ -58,16 +58,16 @@ export default {
main_grid: {
columns: {
cid: "目录代码",
cname: "目录",
val: "代码值",
label: "名称",
pval: "父代码值",
showorder: "排序",
cname: "目录",
cls: "栏目样式",
iconcls: "图标",
vfilter: "过滤项",
disabled: "是否禁用",
expired: "过期/失效",
showorder: "排序",
extension: "扩展",
updatedate: "最后修改时间",
},
......@@ -133,9 +133,9 @@ export default {
caption: "-",
tip: "",
},
tbitem18: {
caption: "Help",
tip: "Help",
deuiaction2: {
caption: "Filter",
tip: "Filter",
},
},
editviewtoolbar_toolbar: {
......
app_web/src/locale/lanres/entities/dict-option/dict-option_zh_CN.ts
浏览文件 @ 60df0e53
......@@ -57,16 +57,16 @@ export default {
main_grid: {
columns: {
cid: "目录代码",
cname: "目录",
val: "代码值",
label: "名称",
pval: "父代码值",
showorder: "排序",
cname: "目录",
cls: "栏目样式",
iconcls: "图标",
vfilter: "过滤项",
disabled: "是否禁用",
expired: "过期/失效",
showorder: "排序",
extension: "扩展",
updatedate: "最后修改时间",
},
......@@ -132,9 +132,9 @@ export default {
caption: "-",
tip: "",
},
tbitem18: {
caption: "帮助",
tip: "帮助",
deuiaction2: {
caption: "过滤",
tip: "过滤",
},
},
editviewtoolbar_toolbar: {
......
app_web/src/pages/dict/dict-catalog-grid-view/dict-catalog-grid-view-base.vue
浏览文件 @ 60df0e53
......@@ -85,13 +85,6 @@
</i-button>
<div slot='content'>{{$t('entities.dictcatalog.gridviewtoolbar_toolbar.tbitem19.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem18.visabled" :disabled="toolBarModels.tbitem18.disabled" class='' @click="toolbar_click({ tag: 'tbitem18' }, $event)">
<i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dictcatalog.gridviewtoolbar_toolbar.tbitem18.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dictcatalog.gridviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip>
</div>
</div>
</div>
......@@ -367,8 +360,6 @@ export default class DictCatalogGridViewBase extends Vue {
tbitem17: { name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
tbitem18: { name: 'tbitem18', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
};
......@@ -721,9 +712,6 @@ export default class DictCatalogGridViewBase extends Vue {
if (Object.is($event.tag, 'tbitem19')) {
this.toolbar_tbitem19_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem18')) {
this.toolbar_tbitem18_click(null, '', $event2);
}
}
......@@ -1160,34 +1148,6 @@ export default class DictCatalogGridViewBase extends Vue {
this.ToggleFilter(datas, contextJO,paramJO, $event, xData,this,"DictCatalog");
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem18_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];
}
// 界面行为
this.Help(datas, contextJO,paramJO, $event, xData,this,"DictCatalog");
}
/**
* 打开新建数据视图
*
......@@ -1502,20 +1462,6 @@ export default class DictCatalogGridViewBase extends Vue {
_this.isExpandSearchForm = !_this.isExpandSearchForm;
}
}
/**
* 帮助
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DictCatalogGridViewBase
*/
public Help(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '帮助未支持' });
}
/**
* 关闭视图
......
app_web/src/pages/dict/dict-option-grid-view/dict-option-grid-view-base.vue
浏览文件 @ 60df0e53
......@@ -66,11 +66,11 @@
<div slot='content'>{{$t('entities.dictoption.gridviewtoolbar_toolbar.tbitem13.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem18.visabled" :disabled="toolBarModels.tbitem18.disabled" class='' @click="toolbar_click({ tag: 'tbitem18' }, $event)">
<i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dictoption.gridviewtoolbar_toolbar.tbitem18.caption')}}</span>
<i-button v-show="toolBarModels.deuiaction2.visabled" :disabled="toolBarModels.deuiaction2.disabled" class='' @click="toolbar_click({ tag: 'deuiaction2' }, $event)">
<i class='fa fa-filter'></i>
<span class='caption'>{{$t('entities.dictoption.gridviewtoolbar_toolbar.deuiaction2.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dictoption.gridviewtoolbar_toolbar.tbitem18.tip')}}</div>
<div slot='content'>{{$t('entities.dictoption.gridviewtoolbar_toolbar.deuiaction2.tip')}}</div>
</tooltip>
</div>
</div>
......@@ -345,7 +345,7 @@ export default class DictOptionGridViewBase extends Vue {
tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000 },
tbitem10: { name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
deuiaction2: { name: 'deuiaction2', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
};
......@@ -693,8 +693,8 @@ export default class DictOptionGridViewBase extends Vue {
if (Object.is($event.tag, 'tbitem11')) {
this.toolbar_tbitem11_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem18')) {
this.toolbar_tbitem18_click(null, '', $event2);
if (Object.is($event.tag, 'deuiaction2')) {
this.toolbar_deuiaction2_click(null, '', $event2);
}
}
......@@ -1084,7 +1084,7 @@ export default class DictOptionGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem18_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -1101,7 +1101,7 @@ export default class DictOptionGridViewBase extends Vue {
datas = [params];
}
// 界面行为
this.Help(datas, contextJO,paramJO, $event, xData,this,"DictOption");
this.ToggleFilter(datas, contextJO,paramJO, $event, xData,this,"DictOption");
}
/**
......@@ -1426,7 +1426,7 @@ export default class DictOptionGridViewBase extends Vue {
xData.print();
}
/**
* 帮助
* 过滤
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
......@@ -1436,8 +1436,11 @@ export default class DictOptionGridViewBase extends Vue {
* @param {*} [actionContext] 执行行为上下文
* @memberof DictOptionGridViewBase
*/
public Help(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '帮助未支持' });
public ToggleFilter(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (_this.hasOwnProperty('isExpandSearchForm')) {
_this.isExpandSearchForm = !_this.isExpandSearchForm;
}
}
/**
......
app_web/src/widgets/dict-catalog/default-searchform/default-searchform-base.vue
浏览文件 @ 60df0e53
......@@ -4,9 +4,9 @@
<row>
<i-col span="20" class="form-content">
<row>
<i-col v-show="detailsModel.n_cid_like.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_cid_like' :itemRules="this.rules.n_cid_like" class='' :caption="$t('entities.dictcatalog.default_searchform.details.n_cid_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_cid_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_cid_like" @enter="onEnter($event)" :disabled="detailsModel.n_cid_like.disabled" type='text' style="width:100px;"></input-box>
<i-col v-show="detailsModel.n_ccode_like.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_ccode_like' :itemRules="this.rules.n_ccode_like" class='' :caption="$t('entities.dictcatalog.default_searchform.details.n_ccode_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_ccode_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_ccode_like" @enter="onEnter($event)" :disabled="detailsModel.n_ccode_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
......@@ -263,7 +263,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public data: any = {
n_cid_like: null,
n_ccode_like: null,
n_cname_like: null,
n_cgroup_like: null,
};
......@@ -275,23 +275,23 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public rules: any = {
n_cid_like: [
{ type: 'string', message: '标识(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '标识(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '标识(文本包含(%)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '标识(文本包含(%)) 值不能为空', trigger: 'blur' },
n_ccode_like: [
{ type: 'string', message: '代码 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '代码 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '代码 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '代码 值不能为空', trigger: 'blur' },
],
n_cname_like: [
{ type: 'string', message: '名称(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '名称(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '名称(文本包含(%)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '名称(文本包含(%)) 值不能为空', trigger: 'blur' },
{ type: 'string', message: '名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
],
n_cgroup_like: [
{ type: 'string', message: '分组(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '分组(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '分组(文本包含(%)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '分组(文本包含(%)) 值不能为空', trigger: 'blur' },
{ type: 'string', message: '分组 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '分组 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '分组 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '分组 值不能为空', trigger: 'blur' },
],
}
......@@ -304,24 +304,24 @@ export default class DefaultBase extends Vue implements ControlInterface {
public detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
n_cid_like: new FormItemModel({ caption: '标识(文本包含(%))', detailType: 'FORMITEM', name: 'n_cid_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
n_ccode_like: new FormItemModel({ caption: '代码', detailType: 'FORMITEM', name: 'n_ccode_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_cname_like: new FormItemModel({ caption: '名称(文本包含(%))', detailType: 'FORMITEM', name: 'n_cname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
n_cname_like: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'n_cname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_cgroup_like: new FormItemModel({ caption: '分组(文本包含(%))', detailType: 'FORMITEM', name: 'n_cgroup_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
n_cgroup_like: new FormItemModel({ caption: '分组', detailType: 'FORMITEM', name: 'n_cgroup_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
/**
* 监控表单属性 n_cid_like 值
* 监控表单属性 n_ccode_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_cid_like')
onN_cid_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_cid_like', newVal: newVal, oldVal: oldVal });
@Watch('data.n_ccode_like')
onN_ccode_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_ccode_like', newVal: newVal, oldVal: oldVal });
}
/**
......
app_web/src/widgets/dict-catalog/default-searchform/default-searchform-model.ts
浏览文件 @ 60df0e53
......@@ -26,8 +26,8 @@ export default class DefaultModel {
dataType: 'TEXT',
},
{
name: 'n_cid_like',
prop: 'id',
name: 'n_ccode_like',
prop: 'code',
dataType: 'TEXT',
},
{
......@@ -40,11 +40,6 @@ export default class DefaultModel {
prop: 'group',
dataType: 'TEXT',
},
{
name: 'dictcatalog',
prop: 'id',
dataType: 'FONTKEY',
},
]
}
......
app_web/src/widgets/dict-catalog/default-searchform/default-searchform-service.ts
浏览文件 @ 60df0e53
......@@ -162,7 +162,6 @@ export default class DefaultService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{id: data.id, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/dict-catalog/main-form/main-form-base.vue
浏览文件 @ 60df0e53
......@@ -4,11 +4,11 @@
<row >
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.dictcatalog.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.dictcatalog.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
<i-col v-show="detailsModel.cid.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='cid' :itemRules="this.rules.cid" class='' :caption="$t('entities.dictcatalog.main_form.details.cid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.cid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.cid" @enter="onEnter($event)" unit="" :disabled="detailsModel.cid.disabled" type='text' style=""></input-box>
<i-col v-show="detailsModel.ccode.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='ccode' :itemRules="this.rules.ccode" class='' :caption="$t('entities.dictcatalog.main_form.details.ccode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ccode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.ccode" @enter="onEnter($event)" unit="" :disabled="detailsModel.ccode.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -377,10 +377,11 @@ export default class MainBase extends Vue implements ControlInterface {
srfuf: null,
srfdeid: null,
srfsourcekey: null,
cid: null,
ccode: null,
cname: null,
cgroup: null,
memo: null,
cid: null,
dictcatalog:null,
};
......@@ -471,17 +472,17 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
cid: [
{ type: 'string', message: '标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '标识 值不能为空', trigger: 'blur' },
ccode: [
{ type: 'string', message: '代码 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '代码 值必须为字符串类型', trigger: 'blur' },
{ required: true, type: 'string', message: '代码 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '代码 值不能为空', trigger: 'blur' },
],
cname: [
{ type: 'string', message: '名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
{ required: true, type: 'string', message: '名称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
],
cgroup: [
{ type: 'string', message: '分组 值必须为字符串类型', trigger: 'change' },
......@@ -495,6 +496,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '备注 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '备注 值不能为空', trigger: 'blur' },
],
cid: [
{ type: 'string', message: '标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '标识 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -504,7 +511,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public detailsModel: any = {
group1: new FormGroupPanelModel({ caption: '字典基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'entities.dictcatalog.main_form', extractMode: 'ITEM', details: [] } })
group1: new FormGroupPanelModel({ caption: '字典基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, uiActionGroup: { caption: '', langbase: 'entities.dictcatalog.main_form', extractMode: 'ITEM', details: [] } })
,
druipart1: new FormDRUIPartModel({ caption: '字典项', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this })
,
......@@ -526,13 +533,15 @@ export default class MainBase extends Vue implements ControlInterface {
,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
cid: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'cid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
ccode: new FormItemModel({ caption: '代码', detailType: 'FORMITEM', name: 'ccode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
,
cname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'cname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
cgroup: new FormItemModel({ caption: '分组', detailType: 'FORMITEM', name: 'cgroup', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
cid: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'cid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
......@@ -633,15 +642,15 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性 cid 值
* 监控表单属性 ccode 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.cid')
onCidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'cid', newVal: newVal, oldVal: oldVal });
@Watch('data.ccode')
onCcodeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'ccode', newVal: newVal, oldVal: oldVal });
}
/**
......@@ -680,6 +689,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'memo', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 cid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.cid')
onCidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'cid', newVal: newVal, oldVal: oldVal });
}
/**
* 重置表单项值
......@@ -731,6 +752,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
......
app_web/src/widgets/dict-catalog/main-form/main-form-model.ts
浏览文件 @ 60df0e53
......@@ -56,8 +56,8 @@ export default class MainModel {
name: 'srfsourcekey',
},
{
name: 'cid',
prop: 'id',
name: 'ccode',
prop: 'code',
dataType: 'TEXT',
},
{
......@@ -75,6 +75,11 @@ export default class MainModel {
prop: 'memo',
dataType: 'TEXT',
},
{
name: 'cid',
prop: 'id',
dataType: 'TEXT',
},
{
name: 'dictcatalog',
prop: 'id',
......
app_web/src/widgets/dict-catalog/main-form/main-form-service.ts
浏览文件 @ 60df0e53
......@@ -162,7 +162,6 @@ export default class MainService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{id: data.id, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/dict-catalog/main-grid/main-grid-base.vue
浏览文件 @ 60df0e53
......@@ -21,15 +21,15 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('cid')">
<el-table-column show-overflow-tooltip :prop="'cid'" :label="$t('entities.dictcatalog.main_grid.columns.cid')" :width="200" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('ccode')">
<el-table-column show-overflow-tooltip :prop="'ccode'" :label="$t('entities.dictcatalog.main_grid.columns.ccode')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dictcatalog.main_grid.columns.cid')}}
{{$t('entities.dictcatalog.main_grid.columns.ccode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.cid}}</span>
<span>{{row.ccode}}</span>
</template>
</el-table-column>
</template>
......@@ -559,9 +559,9 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public allColumns: any[] = [
{
name: 'cid',
label: '标识',
langtag: 'entities.dictcatalog.main_grid.columns.cid',
name: 'ccode',
label: '代码',
langtag: 'entities.dictcatalog.main_grid.columns.ccode',
show: true,
util: 'PX'
},
......@@ -1573,7 +1573,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public getCellClassName(args:{row: any, column: any, rowIndex: number, columnIndex:number}){
let hasRowEdit:any = {
'cid':false,
'ccode':false,
'cname':false,
'cgroup':false,
'memo':false,
......
app_web/src/widgets/dict-catalog/main-grid/main-grid-model.ts
浏览文件 @ 60df0e53
......@@ -26,6 +26,11 @@ export default class MainModel {
]
}else{
return [
{
name: 'ccode',
prop: 'code',
dataType: 'TEXT',
},
{
name: 'cgroup',
prop: 'group',
......@@ -41,11 +46,6 @@ export default class MainModel {
prop: 'updatedate',
dataType: 'DATETIME',
},
{
name: 'cid',
prop: 'id',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
prop: 'name',
......@@ -71,8 +71,8 @@ export default class MainModel {
prop: 'id',
},
{
name: 'n_cid_like',
prop: 'n_cid_like',
name: 'n_ccode_like',
prop: 'n_ccode_like',
dataType: 'TEXT',
},
{
......@@ -85,11 +85,6 @@ export default class MainModel {
prop: 'n_cgroup_like',
dataType: 'TEXT',
},
{
name: 'dictcatalog',
prop: 'id',
dataType: 'FONTKEY',
},
{
name:'size',
......
app_web/src/widgets/dict-catalog/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 60df0e53
......@@ -18,6 +18,9 @@ export default class PickupViewpickupviewpanelModel {
name: 'dictcatalog',
prop: 'id',
},
{
name: 'code',
},
{
name: 'name',
},
......
ibzdict-core/src/main/java/cn/ibizlab/core/dict/domain/DictCatalog.java
浏览文件 @ 60df0e53
......@@ -42,11 +42,19 @@ public class DictCatalog extends EntityMP implements Serializable {
/**
* 标识
*/
@DEField(name = "cid" , isKeyField=true)
@DEField(defaultValue = "code" , defaultValueType = DEFieldDefaultValueType.PARAM , isKeyField=true)
@TableId(value= "cid",type=IdType.ASSIGN_UUID)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
/**
* 代码
*/
@DEField(name = "ccode")
@TableField(value = "ccode")
@JSONField(name = "code")
@JsonProperty("code")
private String code;
/**
* 名称
*/
......@@ -91,6 +99,14 @@ public class DictCatalog extends EntityMP implements Serializable {
/**
* 设置 [代码]
*/
public void setCode(String code){
this.code = code ;
this.modify("ccode",code);
}
/**
* 设置 [名称]
*/
......
ibzdict-core/src/main/java/cn/ibizlab/core/dict/filter/DictCatalogSearchContext.java
浏览文件 @ 60df0e53
......@@ -33,6 +33,13 @@ public class DictCatalogSearchContext extends QueryWrapperContext<DictCatalog> {
if(!ObjectUtils.isEmpty(this.n_cid_like)){
this.getSearchCond().like("cid", n_cid_like);
}
}
private String n_ccode_like;//[代码]
public void setN_ccode_like(String n_ccode_like) {
this.n_ccode_like = n_ccode_like;
if(!ObjectUtils.isEmpty(this.n_ccode_like)){
this.getSearchCond().like("ccode", n_ccode_like);
}
}
private String n_cname_like;//[名称]
public void setN_cname_like(String n_cname_like) {
......
ibzdict-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 60df0e53
......@@ -4,7 +4,7 @@
<!--输出实体[DICT_OPTION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_option-85-1">
<changeSet author="a_A_5d9d78509" id="tab-dict_option-87-1">
<createTable tableName="IBZDICTOPTION">
<column name="VKEY" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
......@@ -40,11 +40,13 @@
<!--输出实体[DICT_CATALOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_catalog-51-2">
<changeSet author="a_A_5d9d78509" id="tab-dict_catalog-62-2">
<createTable tableName="IBZDICTCATALOG">
<column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_CATALOG_CID"/>
</column>
<column name="CCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="CNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="CGROUP" remarks="" type="VARCHAR(100)">
......@@ -59,7 +61,7 @@
</changeSet>
<!--输出实体[DICT_OPTION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-dict_option-85-3">
<changeSet author="a_A_5d9d78509" id="fk-dict_option-87-3">
<addForeignKeyConstraint baseColumnNames="CID" baseTableName="IBZDICTOPTION" constraintName="DER1N_DICT_OPTION_DICT_CATALOG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CID" referencedTableName="IBZDICTCATALOG" validate="true"/>
</changeSet>
<!--输出实体[DICT_CATALOG]外键关系 -->
......
ibzdict-core/src/main/resources/mapper/dict/dictcatalog/DictCatalogMapper.xml
浏览文件 @ 60df0e53
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="DictCatalogResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1 ) t1 where cid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`CCODE`, t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1 ) t1 where cid=#{id}]]>
</select>
<select id="selectById" resultMap="DictCatalogResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.CGROUP, t1.CID, t1.CNAME, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1 ) t1 where cid=#{id}]]>
......@@ -17,6 +17,7 @@
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="DictCatalogResultMap" type="cn.ibizlab.core.dict.domain.DictCatalog" autoMapping="true">
<id property="id" column="cid" /><!--主键字段映射-->
<result property="code" column="ccode" />
<result property="name" column="cname" />
<result property="group" column="cgroup" />
......@@ -35,7 +36,7 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1
<![CDATA[ SELECT t1.`CCODE`, t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1
WHERE t1.ENABLE = 1
]]>
</sql>
......@@ -53,7 +54,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1
<![CDATA[ SELECT t1.`CCODE`, t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1
WHERE t1.ENABLE = 1
]]>
</sql>
......
ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/dto/DictCatalogDTO.java
浏览文件 @ 60df0e53
......@@ -31,6 +31,14 @@ public class DictCatalogDTO extends DTOBase implements Serializable {
@JsonProperty("id")
private String id;
/**
* 属性 [CCODE]
*
*/
@JSONField(name = "code")
@JsonProperty("code")
private String code;
/**
* 属性 [CNAME]
*
......@@ -73,6 +81,14 @@ public class DictCatalogDTO extends DTOBase implements Serializable {
private Timestamp updatedate;
/**
* 设置 [CCODE]
*/
public void setCode(String code){
this.code = code ;
this.modify("ccode",code);
}
/**
* 设置 [CNAME]
*/
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或