Skip to content

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

ibiz4j 发布系统代码

上级 5d1eb714
隐藏空白字符变更
内嵌 并排
正在显示 包含 77 行增加 和 40 行删除
app_web/src/locale/lanres/entities/meta-field/meta-field_en_US.ts
浏览文件 @ d3336c4e
......@@ -112,7 +112,6 @@ export default {
nullable: "允许为空",
predefined: "预定义类型",
relationname: "引用关系",
refentityname: "引用实体",
reffieldname: "引用属性名称",
unionkey: "联合主键",
physicalfield: "物理属性",
......
app_web/src/locale/lanres/entities/meta-field/meta-field_zh_CN.ts
浏览文件 @ d3336c4e
......@@ -111,7 +111,6 @@ export default {
nullable: "允许为空",
predefined: "预定义类型",
relationname: "引用关系",
refentityname: "引用实体",
reffieldname: "引用属性名称",
unionkey: "联合主键",
physicalfield: "物理属性",
......
app_web/src/widgets/meta-field/main-grid/main-grid-base.vue
浏览文件 @ d3336c4e
......@@ -231,18 +231,6 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('refentityname')">
<el-table-column show-overflow-tooltip :prop="'refentityname'" :label="$t('entities.metafield.main_grid.columns.refentityname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metafield.main_grid.columns.refentityname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.refentityname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('reffieldname')">
<el-table-column show-overflow-tooltip :prop="'reffieldname'" :label="$t('entities.metafield.main_grid.columns.reffieldname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -696,7 +684,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @type {string}
* @memberof MainBase
*/
public minorSortDir: string = 'ASC';
public minorSortDir: string = '';
/**
* 排序字段
......@@ -704,7 +692,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @type {string}
* @memberof MainBase
*/
public minorSortPSDEF: string = 'show_order';
public minorSortPSDEF: string = '';
/**
* 分页条数
......@@ -812,7 +800,7 @@ export default class MainBase extends Vue implements ControlInterface {
*
* @memberof MainBase
*/
public defaultUpdateItems:Array<any> =[,,,,,,,,,,,,,,,,,,,,,,];
public defaultUpdateItems:Array<any> =[,,,,,,,,,,,,,,,,,,,,,,,];
/**
* 选中行数据
......@@ -1002,14 +990,6 @@ export default class MainBase extends Vue implements ControlInterface {
unit: 'PX',
isEnableRowEdit: false,
},
{
name: 'refentityname',
label: '引用实体',
langtag: 'entities.metafield.main_grid.columns.refentityname',
show: true,
unit: 'PX',
isEnableRowEdit: false,
},
{
name: 'reffieldname',
label: '引用属性名称',
......@@ -1151,6 +1131,7 @@ export default class MainBase extends Vue implements ControlInterface {
reffieldid: new FormItemModel(),
datatype: new FormItemModel(),
predefined: new FormItemModel(),
extensionfield: new FormItemModel(),
}
}
......@@ -1262,6 +1243,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '预定义类型 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '预定义类型 值不能为空', trigger: 'blur' },
],
extensionfield: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '扩展属性 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '扩展属性 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -1865,7 +1850,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['showorder','fieldname','fieldlogicname','codename','entityname','fieldtype','datatype','datalength','datapreci','dict','keyfield','majorfield','nullable','predefined','relationname','refentityname','reffieldname','unionkey','physicalfield','expression','extensionfield','reffieldid','relationid','entityid'];
let allColumns:Array<any> = ['showorder','fieldname','fieldlogicname','codename','entityname','fieldtype','datatype','datalength','datapreci','dict','keyfield','majorfield','nullable','predefined','relationname','reffieldname','unionkey','physicalfield','expression','extensionfield','reffieldid','relationid','entityid'];
if(row && row.children && row.children.length>0) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1923,7 +1908,6 @@ export default class MainBase extends Vue implements ControlInterface {
nullable:'',
predefined:'',
relationname:'',
refentityname:'',
reffieldname:'',
unionkey:'',
physicalfield:'',
......
app_web/src/widgets/meta-field/main-grid/main-grid-model.ts
浏览文件 @ d3336c4e
......@@ -38,11 +38,6 @@ export default class MainModel {
dataType: 'TEXT',
isEditable:true
},
{
name: 'refentityname',
prop: 'ref_entity_name',
dataType: 'PICKUPDATA',
},
{
name: 'srfmajortext',
prop: 'field_name',
......@@ -54,14 +49,14 @@ export default class MainModel {
dataType: 'TEXT',
},
{
name: 'srfkey',
prop: 'field_id',
name: 'fieldname',
prop: 'field_name',
dataType: 'TEXT',
isEditable:true
},
{
name: 'fieldname',
prop: 'field_name',
name: 'srfkey',
prop: 'field_id',
dataType: 'TEXT',
isEditable:true
},
......@@ -117,6 +112,7 @@ export default class MainModel {
name: 'extensionfield',
prop: 'extension_field',
dataType: 'YESNO',
isEditable:true
},
{
name: 'fieldtype',
......
ibzlite-app/ibzlite-app-web/pom.xml
浏览文件 @ d3336c4e
......@@ -21,6 +21,9 @@
</dependency>
</dependencies>
<properties>
<docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
</properties>
<profiles>
......@@ -95,6 +98,23 @@
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<serverId>ibiz-dev</serverId>
<imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>../../</directory>
<include>${project.artifactId}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
</profile>
......
ibzlite-app/ibzlite-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ d3336c4e
server:
port: 8080
port: 30010
#Log配置
logging:
level:
......
ibzlite-boot/src/main/docker/mysql.yml 0 → 100644
浏览文件 @ d3336c4e
version: "3.2"
services:
ibzlite-mysql:
image: mysql:5.7.20
volumes:
- $PWD/../../../../volumes/mysql/:/var/lib/mysql/
networks:
- agent_network
environment:
- TZ=Asia/Shanghai
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_ROOT_PASSWORD=root
- MYSQL_DATABASE=a_A_5d9d78509
ports:
- 3306:3306
command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8 --explicit_defaults_for_timestamp
networks:
agent_network:
attachable: true
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ d3336c4e
......@@ -178,7 +178,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-132-9">
<changeSet author="a_A_5d9d78509" id="tab-meta_field-133-9">
<createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......
ibzlite-provider/ibzlite-provider-api/pom.xml
浏览文件 @ d3336c4e
......@@ -21,6 +21,9 @@
</dependency>
</dependencies>
<properties>
<docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
</properties>
<profiles>
<profile>
......@@ -54,6 +57,23 @@
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<serverId>ibiz-dev</serverId>
<imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>../../</directory>
<include>${project.artifactId}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
</profile>
......
ibzlite-util/src/main/resources/application-nacos.yml
浏览文件 @ d3336c4e
......@@ -3,7 +3,7 @@ spring:
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
server-addr: 172.16.102.211:8848
enabled: true
eureka:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或