Skip to content

I
ibzlite
提交 eb56d75b 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 ddabbd86
隐藏空白字符变更
内嵌 并排
正在显示 包含 40 行增加 和 40 行删除
app_web/src/codelist/dst-app-list.ts
浏览文件 @ eb56d75b
......@@ -110,8 +110,8 @@ export default class DstAppList {
let itemdata:any = {};
Object.assign(itemdata,{id:item.id});
Object.assign(itemdata,{value:item.id});
Object.assign(itemdata,{text:item.label});
Object.assign(itemdata,{label:item.label});
Object.assign(itemdata,{text:item.id});
Object.assign(itemdata,{label:item.id});
_items.push(itemdata);
});
......
app_web/src/locale/lanres/entities/dst-component/dst-component_en_US.ts
浏览文件 @ eb56d75b
......@@ -40,9 +40,9 @@ export default {
codename: "代码名称",
ctype: "类型",
entityname: "主实体",
cfg: "配置",
systemid: "系统标识",
appid: "应用标识",
cfg: "配置",
entityid: "实体标识",
cid: "部件标识",
},
......
app_web/src/locale/lanres/entities/dst-component/dst-component_zh_CN.ts
浏览文件 @ eb56d75b
......@@ -39,9 +39,9 @@ export default {
codename: "代码名称",
ctype: "类型",
entityname: "主实体",
cfg: "配置",
systemid: "系统标识",
appid: "应用标识",
cfg: "配置",
entityid: "实体标识",
cid: "部件标识",
},
......
app_web/src/widgets/dst-component/main-form/main-form-base.vue
浏览文件 @ eb56d75b
......@@ -80,6 +80,13 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.cfg.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-item name='cfg' :itemRules="this.rules().cfg" class='' :caption="$t('entities.dstcomponent.main_form.details.cfg')" uiStyle="DEFAULT" :labelWidth="0" :isShowCaption="false" :error="detailsModel.cfg.error" :isEmptyCaption="false" labelPos="NONE">
<input-box v-model="data.cfg" :textareaId="this.$util.createUUID()" :disabled="detailsModel.cfg.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.systemid.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='systemid' :itemRules="this.rules().systemid" class='' :caption="$t('entities.dstcomponent.main_form.details.systemid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.systemid.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -120,13 +127,6 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.cfg.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-item name='cfg' :itemRules="this.rules().cfg" class='' :caption="$t('entities.dstcomponent.main_form.details.cfg')" uiStyle="DEFAULT" :labelWidth="0" :isShowCaption="false" :error="detailsModel.cfg.error" :isEmptyCaption="false" labelPos="NONE">
<input-box v-model="data.cfg" :textareaId="this.$util.createUUID()" :disabled="detailsModel.cfg.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
</app-form-item>
</i-col>
</row>
......@@ -476,9 +476,9 @@ export default class MainBase extends Vue implements ControlInterface {
codename: null,
ctype: null,
entityname: null,
cfg: null,
systemid: null,
appid: null,
cfg: null,
entityid: null,
cid: null,
dstcomponent:null,
......@@ -590,6 +590,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: true, type: 'string', message: '主实体 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '主实体 值不能为空', trigger: 'blur' },
],
cfg: [
{ type: 'string', message: '配置 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '配置 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '配置 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '配置 值不能为空', trigger: 'blur' },
],
systemid: [
{ type: 'string', message: '系统标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '系统标识 值必须为字符串类型', trigger: 'blur' },
......@@ -602,12 +608,6 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '应用标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '应用标识 值不能为空', trigger: 'blur' },
],
cfg: [
{ type: 'string', message: '配置 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '配置 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '配置 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '配置 值不能为空', trigger: 'blur' },
],
entityid: [
{ type: 'string', message: '实体标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '实体标识 值必须为字符串类型', trigger: 'blur' },
......@@ -733,12 +733,12 @@ export default class MainBase extends Vue implements ControlInterface {
ctype: new FormItemModel({ caption: '类型', detailType: 'FORMITEM', name: 'ctype', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
entityname: new FormItemModel({ caption: '主实体', detailType: 'FORMITEM', name: 'entityname', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
cfg: new FormItemModel({ caption: '配置', detailType: 'FORMITEM', name: 'cfg', visible: true, isShowCaption: false, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
systemid: new FormItemModel({ caption: '系统标识', detailType: 'FORMITEM', name: 'systemid', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
appid: new FormItemModel({ caption: '应用标识', detailType: 'FORMITEM', name: 'appid', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
cfg: new FormItemModel({ caption: '配置', detailType: 'FORMITEM', name: 'cfg', visible: true, isShowCaption: false, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
entityid: new FormItemModel({ caption: '实体标识', detailType: 'FORMITEM', name: 'entityid', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
......@@ -879,39 +879,39 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性 systemid 值
* 监控表单属性 cfg 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.systemid')
onSystemidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'systemid', newVal: newVal, oldVal: oldVal });
@Watch('data.cfg')
onCfgChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'cfg', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 appid 值
* 监控表单属性 systemid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.appid')
onAppidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'appid', newVal: newVal, oldVal: oldVal });
@Watch('data.systemid')
onSystemidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'systemid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 cfg 值
* 监控表单属性 appid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.cfg')
onCfgChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'cfg', newVal: newVal, oldVal: oldVal });
@Watch('data.appid')
onAppidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'appid', newVal: newVal, oldVal: oldVal });
}
/**
......
app_web/src/widgets/dst-component/main-form/main-form-model.ts
浏览文件 @ eb56d75b
......@@ -70,6 +70,11 @@ export default class MainModel {
prop: 'entity_name',
dataType: 'PICKUPTEXT',
},
{
name: 'cfg',
prop: 'config',
dataType: 'LONGTEXT',
},
{
name: 'systemid',
prop: 'system_id',
......@@ -80,11 +85,6 @@ export default class MainModel {
prop: 'app_id',
dataType: 'PICKUP',
},
{
name: 'cfg',
prop: 'config',
dataType: 'LONGTEXT',
},
{
name: 'entityid',
prop: 'entity_id',
......
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ eb56d75b
......@@ -8,7 +8,7 @@
<!--输出实体[DST_COMPONENT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_component-49-1">
<changeSet author="a_A_5d9d78509" id="tab-dst_component-53-1">
<createTable tableName="IBZCOMPONENT">
<column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
......@@ -54,7 +54,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-24-3">
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-25-3">
<createTable tableName="IBZDATASOURCE">
<column name="DSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
......@@ -297,7 +297,7 @@
</changeSet>
<!--输出实体[DST_COMPONENT]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-dst_component-49-13">
<changeSet author="a_A_5d9d78509" id="fk-dst_component-53-13">
<addForeignKeyConstraint baseColumnNames="ENTITYID" baseTableName="IBZCOMPONENT" constraintName="DER1N_DST_COMPONENT_META_ENTIT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ENTITYID" referencedTableName="IBZENTITY" validate="true"/>
</changeSet>
<!--输出实体[DST_CONFIG]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或