Skip to content

T
TrainSys
提交 dbe68b5d 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

fangzhihao 部署微服务应用 [TrainSys，网页端]

上级 863f9b8d
显示空白字符变更
内嵌 并排
正在显示 包含 118 行增加 和 89 行删除
app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-searchform-base.tsx
浏览文件 @ dbe68b5d
......@@ -71,14 +71,6 @@ export class AppSearchFormBase extends SearchFormControlBase {
@Emit('ctrl-event')
public ctrlEvent({ controlname, action, data }: { controlname: string; action: string; data: any }): void { }
/**
* @description 是否显示搜索下拉
* @type {boolean}
* @memberof AppSearchFormBase
*/
public dropdownVisible: boolean = false;
/**
* 销毁视图回调
*
......@@ -573,6 +565,24 @@ export class AppSearchFormBase extends SearchFormControlBase {
}
}
/**
* @description 搜索下拉点击
* @param {string} name 点击项
* @memberof AppSearchFormBase
*/
public searchDropdownClick(name: string) {
switch (name) {
case 'reset':
this.reset();
break
case 'save':
break
default:
this.fillSearchForm(name);
break;
}
}
/**
* @description 绘制搜索按钮
* @param {string} style 样式
......@@ -590,17 +600,24 @@ export class AppSearchFormBase extends SearchFormControlBase {
return (
<div class="search-action-right">
<i-button class="search" size="default" type='primary' on-click={(...params: any[]) => throttle(this.search,params,this)}>{this.$t('app.searchbutton.search')}</i-button>
<dropdown transfer trigger="custom" transfer-class-name="search-dropdown" visible={this.dropdownVisible} placement="bottom-end" on-on-clickoutside={(event: any) => this.clickOutside(event)}>
<dropdown
transfer
trigger="custom"
transfer-class-name="search-dropdown"
visible={this.dropdownVisible}
placement="bottom-end"
on-on-click={(name: string) => this.searchDropdownClick(name)}
on-on-clickoutside={(event: any) => this.clickOutside(event)}>
<span class="search-dropdown-icon">
<icon type="ios-arrow-down" onClick={() => this.dropdownVisible = !this.dropdownVisible}/>
</span>
<dropdown-menu slot='list'>
<dropdown-item>
<div class="search-dropdown-item" on-click={() => this.reset()}>
<dropdown-item name="reset">
<div class="search-dropdown-item">
{this.$t('app.searchbutton.reset')}
</div>
</dropdown-item>
<dropdown-item>
<dropdown-item name="save">
<poptip
ref="propip"
trigger="hover"
......@@ -622,9 +639,9 @@ export class AppSearchFormBase extends SearchFormControlBase {
{
this.historyItems?.map((item: any) => {
return (
<dropdown-item>
<dropdown-item name={item.value}>
<div class="search-dropdown-item history-item">
<span class="history-item caption" title={item.name} on-click={() => this.data = JSON.parse(JSON.stringify(item.data))}>{item.name}</span>
<span class="history-item caption" title={item.name}>{item.name}</span>
<i class="el-icon-close history-item" on-click={(e: any) => throttle(this.removeHistoryItem,[e, item],this)}/>
</div>
</dropdown-item>
......
app_Web/packages/ibiz-vue/src/components/control/app-default-searchform/app-default-searchform.less
浏览文件 @ dbe68b5d
......@@ -69,27 +69,28 @@
}
}
}
.search-dropdown {
.search-dropdown.ivu-select-dropdown.ivu-dropdown-transfer {
width: 100px !important;
max-height: 150px !important;
overflow-x: hidden;
padding: 10px 0;
overflow: hidden;
.ivu-dropdown-menu {
.ivu-dropdown-item {
height: 32px;
padding: 0 20px;
line-height: 36px;
&:hover {
background-color: #ecf5ff;
color: #66b1ff;
}
.search-dropdown-item {
&.history-item {
display: flex;
align-items: center;
padding: 4px 8px !important;
.search-dropdown-item {
.history-item.caption {
width: 55px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
&.history-item {
display: flex;
.history-item.caption {
width: 80px;
}
.el-icon-close.history-item {
position: relative;
top: 3px;
}
}
}
......
app_Web/packages/ibiz-vue/src/widgets/searchform-control-base.tsx
浏览文件 @ dbe68b5d
......@@ -76,6 +76,13 @@ export class SearchFormControlBase extends EditFormControlBase implements Search
*/
public enableSaveFilter: boolean = true;
/**
* @description 是否显示搜索下拉
* @type {boolean}
* @memberof SearchFormControlBase
*/
public dropdownVisible: boolean = false;
/**
* 监听静态参数变化
*
......@@ -320,6 +327,7 @@ export class SearchFormControlBase extends EditFormControlBase implements Search
let propip: any = this.$refs.propip;
propip.handleMouseleave();
this.onSave(this.saveItemName);
this.dropdownVisible = false;
}
/**
......@@ -334,6 +342,20 @@ export class SearchFormControlBase extends EditFormControlBase implements Search
}
let propip: any = this.$refs.propip;
propip.handleMouseleave();
this.dropdownVisible = false;
}
/**
* @description 填充搜索表单
* @param {string} value 历史记录值
* @memberof SearchFormControlBase
*/
public fillSearchForm(value: string) {
const find = this.historyItems.find((item: any) => Object.is(item.value, value));
if (find) {
this.data = JSON.parse(JSON.stringify(find.data));
this.dropdownVisible = false;
}
}
/**
......
app_Web/swarm.yaml
浏览文件 @ dbe68b5d
......@@ -3,7 +3,7 @@ services:
trainsys-app-web:
image: dstimage
ports:
- "80:80"
- "50100:80"
networks:
- agent_network
environment:
......
config.xml
浏览文件 @ dbe68b5d
......@@ -55,14 +55,15 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/
mvn clean package -Ptrainsys
mvn install -Ptrainsys
cd trainsys-provider
sed -i "s#dstimage#$para5#g" pom.xml
sed -i "s#dstimage#$para5#g" src/main/docker/trainsys-provider-trainsys.yaml
mvn -Ptrainsys docker:build
mvn -Ptrainsys docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth
mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
if [ -e app_Web/.dynamic ]
then
cd app_Web
else
cd app_Web/app
fi
sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.29.003#g" swarm.yaml
docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
trainsys-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ dbe68b5d
......@@ -156,6 +156,25 @@
</createTable>
</changeSet>
<!--输出实体[RAWMATERIAL]数据结构 -->
<changeSet author="root" id="tab-rawmaterial-25-6">
<createTable tableName="T_RAWMATERIAL">
<column name="RAWMATERIALID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RAWMATERIAL"/>
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="RAWMATERIALNAME" remarks="" type="VARCHAR(200)">
</column>
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column>
</createTable>
</changeSet>
<!--输出实体[REGINFO]数据结构 -->
<changeSet author="root" id="tab-reginfo-36-7">
<createTable tableName="T_REGINFO">
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/RawMaterial.json
浏览文件 @ dbe68b5d
......@@ -174,6 +174,14 @@
},
"builtinAction" : true
} ],
"getAllPSDEDBConfigs" : [ {
"dBType" : "MYSQL5",
"name" : "MYSQL5",
"objNameCase" : "DEFAULT",
"standardTableName" : "`T_RAWMATERIAL`",
"tableName" : "T_RAWMATERIAL",
"valid" : true
} ],
"getAllPSDEDBTables" : [ {
"getAllPSDEFields" : [ {
"name" : "RAWMATERIALID",
......
trainsys-provider/pom.xml
浏览文件 @ dbe68b5d
......@@ -34,7 +34,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ dbe68b5d
......@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
EXPOSE 50000
EXPOSE 8081
ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ dbe68b5d
......@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
ports:
- containerPort: 50000
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.240.140"
- name: SERVER_PORT
value: "50000"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.240.140:8848"
- name: SPRING_REDIS_HOST
value: "127.0.0.1"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_LAB01_d23cc850e"
- name: SPRING_DATASOURCE_PASSWORD
value: "f9Df4556"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_LAB01_d23cc850e"
- name: NACOS
value: "172.16.240.140:8848"
- containerPort: 8081
---
apiVersion: v1
......@@ -60,9 +35,9 @@ spec:
type: NodePort
ports:
- name: http
port: 50000
targetPort: 50000
nodePort: 50000
port: 8081
targetPort: 8081
nodePort: 8081
protocol: TCP
selector:
app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ dbe68b5d
......@@ -3,23 +3,9 @@ services:
trainsys-provider:
image: dstimage
ports:
- "50000:50000"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
- SERVER_PORT=50000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
- SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
- SPRING_REDIS_HOST=127.0.0.1
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
- SPRING_DATASOURCE_PASSWORD=f9Df4556
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
- NACOS=172.16.240.140:8848
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或