Skip to content

I
ibzlite
提交 0f773b89 编写于 作者: lzlhxj's avatar lzlhxj
浏览文件
操作

Merge remote-tracking branch 'origin/master' into master

上级 96ec581e fe402b87
显示空白字符变更
内嵌 并排
正在显示 包含 51 行增加 和 38 行删除
app_web/src/components/avue-component/avue-component.less
浏览文件 @ 0f773b89
.avue-component{
border:1px solid #f0f0f0;
padding:5px;
.form-designer{
.fields-list{
a{
color:#333!important;
}
a:hover{
color:#2b85e4!important;
}
}
}
}
\ No newline at end of file
app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_en_US.ts
浏览文件 @ 0f773b89
......@@ -52,7 +52,7 @@ export default {
codename: "代码名称",
refentityname: "引用实体名称",
nestedname: "嵌套代码名称",
lookup: "Lookup",
dstlookups: "Lookup",
refentityid: "引用实体标识",
entityid: "实体标识",
relationid: "关系标识",
......
app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_zh_CN.ts
浏览文件 @ 0f773b89
......@@ -51,7 +51,7 @@ export default {
codename: "代码名称",
refentityname: "引用实体名称",
nestedname: "嵌套代码名称",
lookup: "Lookup",
dstlookups: "Lookup",
refentityid: "引用实体标识",
entityid: "实体标识",
relationid: "关系标识",
......
app_web/src/widgets/dst-router/main-form/main-form-base.vue
浏览文件 @ 0f773b89
......@@ -43,8 +43,7 @@
</i-col>
<i-col v-show="detailsModel.meta.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='meta' :itemRules="this.rules().meta" class='' :caption="$t('entities.dstrouter.main_form.details.meta')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.meta.error" :isEmptyCaption="false" labelPos="TOP">
<input-box v-model="data.meta" :textareaId="this.$util.createUUID()" :disabled="detailsModel.meta.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
<avue-custom-form :isParseString="true" :isFormData="false" v-model="data.meta" :formData="data" :url="`/lite/ibzlite-web/components/router_meta`" :formState="formState"></avue-custom-form>
</app-form-item>
</i-col>
......
app_web/src/widgets/meta-relationship/main-form/main-form-base.vue
浏览文件 @ 0f773b89
......@@ -115,6 +115,12 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.dstlookups.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='dstlookups' :itemRules="this.rules().dstlookups" class='' :caption="$t('entities.metarelationship.main_form.details.dstlookups')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.dstlookups.error" :isEmptyCaption="false" labelPos="LEFT">
<avue-custom-form :isParseString="true" :isFormData="false" v-model="data.dstlookups" :formData="data" :url="`/lite/ibzlite-web/components/lookup`" :formState="formState"></avue-custom-form>
</app-form-item>
</i-col>
</row>
......@@ -474,7 +480,7 @@ export default class MainBase extends Vue implements ControlInterface {
codename: null,
refentityname: null,
nestedname: null,
lookup: null,
dstlookups: null,
refentityid: null,
entityid: null,
relationid: null,
......@@ -599,11 +605,11 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.nestedname.required, type: 'string', message: '嵌套代码名称 值不能为空', trigger: 'change' },
{ required: this.detailsModel.nestedname.required, type: 'string', message: '嵌套代码名称 值不能为空', trigger: 'blur' },
],
lookup: [
dstlookups: [
{ type: 'string', message: 'Lookup 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: 'Lookup 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.lookup.required, type: 'string', message: 'Lookup 值不能为空', trigger: 'change' },
{ required: this.detailsModel.lookup.required, type: 'string', message: 'Lookup 值不能为空', trigger: 'blur' },
{ required: this.detailsModel.dstlookups.required, type: 'string', message: 'Lookup 值不能为空', trigger: 'change' },
{ required: this.detailsModel.dstlookups.required, type: 'string', message: 'Lookup 值不能为空', trigger: 'blur' },
],
refentityid: [
{ type: 'string', message: '引用实体标识 值必须为字符串类型', trigger: 'change' },
......@@ -741,7 +747,7 @@ export default class MainBase extends Vue implements ControlInterface {
,
nestedname: new FormItemModel({ caption: '嵌套代码名称', detailType: 'FORMITEM', name: 'nestedname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
lookup: new FormItemModel({ caption: 'Lookup', detailType: 'FORMITEM', name: 'lookup', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
dstlookups: new FormItemModel({ caption: 'Lookup', detailType: 'FORMITEM', name: 'dstlookups', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
refentityid: new FormItemModel({ caption: '引用实体标识', detailType: 'FORMITEM', name: 'refentityid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -908,15 +914,15 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性 lookup 值
* 监控表单属性 dstlookups 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.lookup')
onLookupChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'lookup', newVal: newVal, oldVal: oldVal });
@Watch('data.dstlookups')
onDstlookupsChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'dstlookups', newVal: newVal, oldVal: oldVal });
}
/**
......
app_web/src/widgets/meta-relationship/main-form/main-form-model.ts
浏览文件 @ 0f773b89
......@@ -81,9 +81,8 @@ export default class MainModel {
dataType: 'TEXT',
},
{
name: 'lookup',
prop: 'lookup',
dataType: 'ONE2MANYDATA',
name: 'dstlookups',
dataType:'FORMITEM',
},
{
name: 'refentityid',
......
config.xml
浏览文件 @ 0f773b89
......@@ -37,11 +37,6 @@
git clone -b master $para2 ibzlite/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzlite/
mvn clean package -Pweb
cd ibzlite-app/ibzlite-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzlite-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzlite-app/ibzlite-app-web/src/main/docker/Dockerfile
浏览文件 @ 0f773b89
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzlite-app-web.jar
EXPOSE 30010
EXPOSE 8080
ADD ibzlite-app-web.jar /ibzlite-app-web.jar
ibzlite-app/ibzlite-app-web/src/main/docker/ibzlite-app-web.yaml
浏览文件 @ 0f773b89
......@@ -3,22 +3,9 @@ services:
ibzlite-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
ports:
- "30010:30010"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30010
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.102.211:8848
deploy:
resources:
limits:
......
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 0f773b89
......@@ -74,7 +74,7 @@
<!--输出实体[DST_ROUTER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_router-30-4">
<changeSet author="a_A_5d9d78509" id="tab-dst_router-32-4">
<createTable tableName="IBZROUTER">
<column name="ROUTERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
......@@ -272,7 +272,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-77-12">
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-79-12">
<createTable tableName="IBZRELATION">
<column name="RELATIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/LiteCoreResource.java
浏览文件 @ 0f773b89
......@@ -3,6 +3,8 @@ package cn.ibizlab.api.rest.extensions;
import cn.ibizlab.core.lite.domain.DstComponent;
import cn.ibizlab.core.lite.domain.DstSystem;
import cn.ibizlab.core.lite.extensions.domain.EntityModel;
import cn.ibizlab.core.lite.extensions.domain.FieldModel;
import cn.ibizlab.core.lite.extensions.domain.RelationshipModel;
import cn.ibizlab.core.lite.extensions.domain.SysModel;
import cn.ibizlab.core.lite.extensions.service.LiteCoreService;
import cn.ibizlab.core.lite.extensions.service.LiteModelService;
......@@ -43,6 +45,21 @@ public class LiteCoreResource {
return ResponseEntity.status(HttpStatus.OK).body(liteModelService.getEntityModel(system,entity));
}
@RequestMapping(method = RequestMethod.GET, value = "/lite/{system}/entitys/{entity}/fields")
public ResponseEntity<List<FieldModel>> getEntityModelFields(@PathVariable("system") String system, @PathVariable("entity") String entity) {
return ResponseEntity.status(HttpStatus.OK).body(liteModelService.getEntityModel(system,entity).getFields());
}
@RequestMapping(method = RequestMethod.GET, value = "/lite/{system}/entitys/{entity}/references")
public ResponseEntity<List<RelationshipModel>> getEntityModelReferences(@PathVariable("system") String system, @PathVariable("entity") String entity) {
return ResponseEntity.status(HttpStatus.OK).body(liteModelService.getEntityModel(system,entity).getReferences());
}
@RequestMapping(method = RequestMethod.GET, value = "/lite/{system}/entitys/{entity}/nesteds")
public ResponseEntity<List<RelationshipModel>> getEntityModelNesteds(@PathVariable("system") String system, @PathVariable("entity") String entity) {
return ResponseEntity.status(HttpStatus.OK).body(liteModelService.getEntityModel(system,entity).getNesteds());
}
@RequestMapping(method = RequestMethod.GET, value = "/lite/{app}/components/{component}")
public ResponseEntity<JSON> getComponent(@PathVariable("app") String app, @PathVariable("component") String component) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或