Skip to content

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

ibiz4j 发布系统代码

上级 d3004d2b
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1965 行增加 和 18 行删除
app_web/src/locale/lanres/entities/dict-option/dict-option_en_US.ts
浏览文件 @ 5ddb5891
...@@ -33,6 +33,7 @@ export default { ...@@ -33,6 +33,7 @@ export default {
srfupdatedate: "最后修改时间", srfupdatedate: "最后修改时间",
srforikey: "", srforikey: "",
srfkey: "标识", srfkey: "标识",
srfmajortext: "名称",
srftempmode: "", srftempmode: "",
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
......
app_web/src/locale/lanres/entities/dict-option/dict-option_zh_CN.ts
浏览文件 @ 5ddb5891
...@@ -32,6 +32,7 @@ export default { ...@@ -32,6 +32,7 @@ export default {
srfupdatedate: "最后修改时间", srfupdatedate: "最后修改时间",
srforikey: "", srforikey: "",
srfkey: "标识", srfkey: "标识",
srfmajortext: "名称",
srftempmode: "", srftempmode: "",
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
......
app_web/src/pages/dict/dict-option-edit-view/dict-option-edit-view-base.vue
浏览文件 @ 5ddb5891
...@@ -368,6 +368,7 @@ export default class DictOptionEditViewBase extends Vue { ...@@ -368,6 +368,7 @@ export default class DictOptionEditViewBase extends Vue {
form: this.$refs.form, form: this.$refs.form,
p2k: '0', p2k: '0',
keyPSDEField: 'dictoption', keyPSDEField: 'dictoption',
majorPSDEField: 'label',
isLoadDefault: true, isLoadDefault: true,
}); });
} }
......
app_web/src/pages/dict/dict-option-grid-view/dict-option-grid-view-base.vue
浏览文件 @ 5ddb5891
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class='view-top-messages'> <div class='view-top-messages'>
</div> </div>
<div style='margin-bottom: 6px;'> <div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="" /> <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="名称" />
<div class='pull-right'> <div class='pull-right'>
<div class='toolbar-container'> <div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
...@@ -402,6 +402,7 @@ export default class DictOptionGridViewBase extends Vue { ...@@ -402,6 +402,7 @@ export default class DictOptionGridViewBase extends Vue {
grid: this.$refs.grid, grid: this.$refs.grid,
searchform: this.$refs.searchform, searchform: this.$refs.searchform,
keyPSDEField: 'dictoption', keyPSDEField: 'dictoption',
majorPSDEField: 'label',
isLoadDefault: true, isLoadDefault: true,
}); });
} }
......
app_web/src/service/dict-option/dict-option-service-base.ts
浏览文件 @ 5ddb5891
...@@ -31,7 +31,7 @@ export default class DictOptionServiceBase extends EntityService { ...@@ -31,7 +31,7 @@ export default class DictOptionServiceBase extends EntityService {
this.APPLYDEKEY ='dictoption'; this.APPLYDEKEY ='dictoption';
this.APPDEKEY = 'value_key'; this.APPDEKEY = 'value_key';
this.APPDENAME = 'dictoptions'; this.APPDENAME = 'dictoptions';
this.APPDETEXT = ''; this.APPDETEXT = 'label';
this.APPNAME = 'web'; this.APPNAME = 'web';
this.SYSTEMNAME = 'ibzdict'; this.SYSTEMNAME = 'ibzdict';
} }
......
app_web/src/widgets/dict-option/main-form/main-form-base.vue
浏览文件 @ 5ddb5891
...@@ -436,6 +436,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -436,6 +436,7 @@ export default class MainBase extends Vue implements ControlInterface {
srfupdatedate: null, srfupdatedate: null,
srforikey: null, srforikey: null,
srfkey: null, srfkey: null,
srfmajortext: null,
srftempmode: null, srftempmode: null,
srfuf: null, srfuf: null,
srfdeid: null, srfdeid: null,
...@@ -513,6 +514,12 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -513,6 +514,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '标识 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '标识 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '标识 值不能为空', trigger: 'blur' },
], ],
srfmajortext: [
{ type: 'string', message: '名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
],
srftempmode: [ srftempmode: [
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
...@@ -633,6 +640,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -633,6 +640,8 @@ export default class MainBase extends Vue implements ControlInterface {
srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srfkey: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfkey: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
srfmajortext: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
...@@ -706,6 +715,18 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -706,6 +715,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'srfkey', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'srfkey', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 srfmajortext 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.srfmajortext')
onSrfmajortextChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'srfmajortext', newVal: newVal, oldVal: oldVal });
}
/** /**
* 监控表单属性 srftempmode 值 * 监控表单属性 srftempmode 值
* *
...@@ -966,6 +987,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -966,6 +987,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
......
app_web/src/widgets/dict-option/main-form/main-form-model.ts
浏览文件 @ 5ddb5891
...@@ -38,6 +38,11 @@ export default class MainModel { ...@@ -38,6 +38,11 @@ export default class MainModel {
prop: 'value_key', prop: 'value_key',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'srfmajortext',
prop: 'label',
dataType: 'TEXT',
},
{ {
name: 'srftempmode', name: 'srftempmode',
}, },
......
app_web/src/widgets/dict-option/main-grid/main-grid-model.ts
浏览文件 @ 5ddb5891
...@@ -56,6 +56,11 @@ export default class MainModel { ...@@ -56,6 +56,11 @@ export default class MainModel {
prop: 'catalog_id', prop: 'catalog_id',
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{
name: 'srfmajortext',
prop: 'label',
dataType: 'TEXT',
},
{ {
name: 'srfdataaccaction', name: 'srfdataaccaction',
prop: 'value_key', prop: 'value_key',
......
ibzdict-core/src/main/java/cn/ibizlab/core/dict/filter/DictOptionSearchContext.java
浏览文件 @ 5ddb5891
...@@ -77,6 +77,9 @@ public class DictOptionSearchContext extends QueryWrapperContext<DictOption> { ...@@ -77,6 +77,9 @@ public class DictOptionSearchContext extends QueryWrapperContext<DictOption> {
{ {
this.query=query; this.query=query;
if(!StringUtils.isEmpty(query)){ if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper ->
wrapper.like("label", query)
);
} }
} }
} }
......
ibzdict-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 5ddb5891
!!!!模版产生代码错误:---- <?xml version="1.1" encoding="UTF-8" standalone="no"?>
Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)?? <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
----
----
FTL stack trace ("~" means nesting-related): <!--输出实体[DICT_OPTION]数据结构 -->
- Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_zh_CN" at line 28, column 24] <changeSet author="a_A_5d9d78509" id="tab-dict_option-81-1">
---- <createTable tableName="IBZDICTOPTION">
\ No newline at end of file <column name="VKEY" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
</column>
<column name="CID" remarks="" type="VARCHAR(100)">
</column>
<column name="CNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="VAL" remarks="" type="VARCHAR(40)">
</column>
<column name="LABEL" remarks="" type="VARCHAR(100)">
</column>
<column name="PVAL" remarks="" type="VARCHAR(40)">
</column>
<column name="VFILTER" remarks="" type="VARCHAR(500)">
</column>
<column name="CLS" remarks="" type="VARCHAR(500)">
</column>
<column name="ICONCLS" remarks="" type="VARCHAR(255)">
</column>
<column name="DISABLED" remarks="" type="INT">
</column>
<column name="EXPIRED" remarks="" type="INT">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
<column name="EXTENSION" remarks="" type="VARCHAR(1000)">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[DICT_CATALOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_catalog-50-2">
<createTable tableName="IBZDICTCATALOG">
<column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_CATALOG_CID"/>
</column>
<column name="CNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="CGROUP" remarks="" type="VARCHAR(100)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(255)">
</column>
<column name="ENABLE" remarks="" type="INT">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[DICT_OPTION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-dict_option-81-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]外键关系 -->
</databaseChangeLog>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或