Skip to content

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

ibiz4j 发布系统代码

上级 bf890bfe
隐藏空白字符变更
内嵌 并排
正在显示 包含 50 行增加 和 28 行删除
app_web/src/widgets/dict-option/main-grid/main-grid-base.vue
浏览文件 @ 259c28c1
......@@ -251,7 +251,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('disabled')">
<el-table-column show-overflow-tooltip :prop="'disabled'" :label="$t('entities.dictoption.main_grid.columns.disabled')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'disabled'" :label="$t('entities.dictoption.main_grid.columns.disabled')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dictoption.main_grid.columns.disabled')}}
......@@ -285,7 +285,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('expired')">
<el-table-column show-overflow-tooltip :prop="'expired'" :label="$t('entities.dictoption.main_grid.columns.expired')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'expired'" :label="$t('entities.dictoption.main_grid.columns.expired')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dictoption.main_grid.columns.expired')}}
......@@ -355,19 +355,25 @@
<template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
<textarea class="ivu-input" rows="10" :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" v-model="row[column.property]" style="" @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
</div>
<input-box
:disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"
v-model="row[column.property]"
style=""
type="text"
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='extension' editorType="TEXTAREA" :value="row.extension"></app-span>
<app-span name='extension' editorType="TEXTBOX" :value="row.extension"></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('updatedate')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.dictoption.main_grid.columns.updatedate')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.dictoption.main_grid.columns.updatedate')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dictoption.main_grid.columns.updatedate')}}
......
ibzdict-core/src/main/java/cn/ibizlab/core/dict/domain/DictOption.java
浏览文件 @ 259c28c1
......@@ -257,6 +257,22 @@ public class DictOption extends EntityMP implements Serializable {
}
/**
* 获取 [标识]
*/
public String getValueKey(){
if(ObjectUtils.isEmpty(valueKey)){
valueKey=(String)getDefaultKey(true);
}
return valueKey;
}
@Override
public Serializable getDefaultKey(boolean gen) {
if((!ObjectUtils.isEmpty(this.getCatalogId()))&&(!ObjectUtils.isEmpty(this.getValue())))
return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getCatalogId(),this.getValue()).getBytes());
return null;
}
}
ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictOptionServiceImpl.java
浏览文件 @ 259c28c1
......@@ -114,7 +114,7 @@ public class DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
@Override
public void createBatch(List<DictOption> list) {
list.forEach(item->fillParentData(item));
this.saveBatch(list,batchSize);
this.saveOrUpdateBatch(list,batchSize);
}
@Override
......
ibzdict-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 259c28c1
......@@ -4,7 +4,7 @@
<!--输出实体[DICT_OPTION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_option-83-1">
<changeSet author="a_A_5d9d78509" id="tab-dict_option-85-1">
<createTable tableName="IBZDICTOPTION">
<column name="VKEY" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
......@@ -59,7 +59,7 @@
</changeSet>
<!--输出实体[DICT_OPTION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-dict_option-83-3">
<changeSet author="a_A_5d9d78509" id="fk-dict_option-85-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
浏览文件 @ 259c28c1
......@@ -35,38 +35,38 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1
WHERE t1.ENABLE = 1
<![CDATA[ SELECT t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.CGROUP, t1.CID, t1.CNAME, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1
WHERE t1.ENABLE = 1
<![CDATA[ SELECT t1.CGROUP, t1.CID, t1.CNAME, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.CGROUP, t1.CID, t1.CNAME, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1
WHERE t1.ENABLE = 1
<![CDATA[ SELECT t1.CGROUP, t1.CID, t1.CNAME, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1
WHERE t1.ENABLE = 1
<![CDATA[ SELECT t1.`CGROUP`, t1.`CID`, t1.`CNAME`, t1.`ENABLE`, t1.`MEMO`, t1.`UPDATEDATE` FROM `IBZDICTCATALOG` t1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.CGROUP, t1.CID, t1.CNAME, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1
WHERE t1.ENABLE = 1
<![CDATA[ SELECT t1.CGROUP, t1.CID, t1.CNAME, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1
WHERE t1.ENABLE = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.CGROUP, t1.CID, t1.CNAME, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1
WHERE t1.ENABLE = 1
<![CDATA[ SELECT t1.CGROUP, t1.CID, t1.CNAME, t1.ENABLE, t1.MEMO, t1.UPDATEDATE FROM IBZDICTCATALOG t1
WHERE t1.ENABLE = 1
]]>
</sql>
</mapper>
......
ibzdict-core/src/main/resources/mapper/dict/dictoption/DictOptionMapper.xml
浏览文件 @ 259c28c1
......@@ -48,32 +48,32 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CID`, t1.`CLS`, t1.`CNAME`, t1.`DISABLED`, t1.`EXPIRED`, t1.`EXTENSION`, t1.`ICONCLS`, t1.`LABEL`, t1.`PVAL`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`VAL`, t1.`VFILTER`, t1.`VKEY` FROM `IBZDICTOPTION` t1
<![CDATA[ SELECT t1.`CID`, t1.`CLS`, t1.`CNAME`, t1.`DISABLED`, t1.`EXPIRED`, t1.`EXTENSION`, t1.`ICONCLS`, t1.`LABEL`, t1.`PVAL`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`VAL`, t1.`VFILTER`, t1.`VKEY` FROM `IBZDICTOPTION` t1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.CID, t1.CLS, t1.CNAME, t1.DISABLED, t1.EXPIRED, t1.EXTENSION, t1.ICONCLS, t1.LABEL, t1.PVAL, t1.SHOWORDER, t1.UPDATEDATE, t1.VAL, t1.VFILTER, t1.VKEY FROM IBZDICTOPTION t1
<![CDATA[ SELECT t1.CID, t1.CLS, t1.CNAME, t1.DISABLED, t1.EXPIRED, t1.EXTENSION, t1.ICONCLS, t1.LABEL, t1.PVAL, t1.SHOWORDER, t1.UPDATEDATE, t1.VAL, t1.VFILTER, t1.VKEY FROM IBZDICTOPTION t1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.CID, t1.CLS, t1.CNAME, t1.DISABLED, t1.EXPIRED, t1.EXTENSION, t1.ICONCLS, t1.LABEL, t1.PVAL, t1.SHOWORDER, t1.UPDATEDATE, t1.VAL, t1.VFILTER, t1.VKEY FROM IBZDICTOPTION t1
<![CDATA[ SELECT t1.CID, t1.CLS, t1.CNAME, t1.DISABLED, t1.EXPIRED, t1.EXTENSION, t1.ICONCLS, t1.LABEL, t1.PVAL, t1.SHOWORDER, t1.UPDATEDATE, t1.VAL, t1.VFILTER, t1.VKEY FROM IBZDICTOPTION t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CID`, t1.`CLS`, t1.`CNAME`, t1.`DISABLED`, t1.`EXPIRED`, t1.`EXTENSION`, t1.`ICONCLS`, t1.`LABEL`, t1.`PVAL`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`VAL`, t1.`VFILTER`, t1.`VKEY` FROM `IBZDICTOPTION` t1
<![CDATA[ SELECT t1.`CID`, t1.`CLS`, t1.`CNAME`, t1.`DISABLED`, t1.`EXPIRED`, t1.`EXTENSION`, t1.`ICONCLS`, t1.`LABEL`, t1.`PVAL`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`VAL`, t1.`VFILTER`, t1.`VKEY` FROM `IBZDICTOPTION` t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.CID, t1.CLS, t1.CNAME, t1.DISABLED, t1.EXPIRED, t1.EXTENSION, t1.ICONCLS, t1.LABEL, t1.PVAL, t1.SHOWORDER, t1.UPDATEDATE, t1.VAL, t1.VFILTER, t1.VKEY FROM IBZDICTOPTION t1
<![CDATA[ SELECT t1.CID, t1.CLS, t1.CNAME, t1.DISABLED, t1.EXPIRED, t1.EXTENSION, t1.ICONCLS, t1.LABEL, t1.PVAL, t1.SHOWORDER, t1.UPDATEDATE, t1.VAL, t1.VFILTER, t1.VKEY FROM IBZDICTOPTION t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.CID, t1.CLS, t1.CNAME, t1.DISABLED, t1.EXPIRED, t1.EXTENSION, t1.ICONCLS, t1.LABEL, t1.PVAL, t1.SHOWORDER, t1.UPDATEDATE, t1.VAL, t1.VFILTER, t1.VKEY FROM IBZDICTOPTION t1
<![CDATA[ SELECT t1.CID, t1.CLS, t1.CNAME, t1.DISABLED, t1.EXPIRED, t1.EXTENSION, t1.ICONCLS, t1.LABEL, t1.PVAL, t1.SHOWORDER, t1.UPDATEDATE, t1.VAL, t1.VFILTER, t1.VKEY FROM IBZDICTOPTION t1
]]>
</sql>
</mapper>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或