Skip to content

I
ibzou
提交 4fa89bb6 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 c788c5d7
隐藏空白字符变更
内嵌 并排
正在显示 包含 74 行增加 和 75 行删除
app_web/package.json
浏览文件 @ 4fa89bb6
......@@ -24,7 +24,7 @@
"element-ui": "^2.13.0",
"file-saver": "^2.0.2",
"font-awesome": "^4.7.0",
"ibiz-gantt-elastic": "^1.0.12",
"ibiz-gantt-elastic": "^1.0.13",
"ibiz-vue-lib": "^0.1.7",
"interactjs": "^1.9.4",
"moment": "^2.24.0",
......
app_web/src/locale/lanres/ibzorganization/ibzorganization_en_US.ts
浏览文件 @ 4fa89bb6
......@@ -79,9 +79,9 @@ export default {
orgcode: "单位代码",
orgname: "名称",
porgname: "上级单位",
porgid: "上级单位",
enable: "逻辑有效",
orgid: "单位标识",
porgid: "上级单位",
},
uiactions: {
},
......
app_web/src/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts
浏览文件 @ 4fa89bb6
......@@ -78,9 +78,9 @@ export default {
orgcode: '单位代码',
orgname: '名称',
porgname: '上级单位',
porgid: '上级单位',
enable: '逻辑有效',
orgid: '单位标识',
porgid: '上级单位',
},
uiactions: {
},
......
app_web/src/widgets/ibzorganization/new-form-form/new-form-form-base.vue
浏览文件 @ 4fa89bb6
......@@ -20,26 +20,7 @@
</i-col>
<i-col v-show="detailsModel.porgname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='porgname' :itemRules="this.rules.porgname" class='' :caption="$t('entities.ibzorganization.newform_form.details.porgname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.porgname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
:formState="formState"
:data="data"
:context="context"
:viewparams="viewparams"
:itemParam='{ }'
:disabled="detailsModel.porgname.disabled"
name='porgname'
deMajorField='orgname'
deKeyField='ibzorganization'
:service="service"
:acParams="{ serviceName: 'IBZOrganizationService', interfaceName: 'FetchDefault'}"
valueitem='porgid'
:value="data.porgname"
editortype=""
:pickupView="{ viewname: 'ibzorganization-pickup-view', title: $t('entities.ibzorganization.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
<app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'porgid','label':'porgname'}" :multiple="false" style="" @select-change="onFormItemValueChange"></app-org-select>
</app-form-item>
</i-col>
......@@ -357,9 +338,9 @@ export default class NewFormBase extends Vue implements ControlInterface {
orgcode: null,
orgname: null,
porgname: null,
porgid: null,
enable: null,
orgid: null,
porgid: null,
ibzorganization:null,
};
......@@ -468,6 +449,12 @@ export default class NewFormBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'blur' },
],
porgid: [
{ type: 'string', message: '上级单位 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '上级单位 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'blur' },
],
enable: [
{ type: 'number', message: '逻辑有效 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '逻辑有效 值必须为数值类型', trigger: 'blur' },
......@@ -480,12 +467,6 @@ export default class NewFormBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '单位标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '单位标识 值不能为空', trigger: 'blur' },
],
porgid: [
{ type: 'string', message: '上级单位 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '上级单位 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -520,12 +501,12 @@ export default class NewFormBase extends Vue implements ControlInterface {
orgname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'orgname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
porgname: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'porgname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
porgid: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'porgid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
enable: new FormItemModel({ caption: '逻辑有效', detailType: 'FORMITEM', name: 'enable', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
orgid: new FormItemModel({ caption: '单位标识', detailType: 'FORMITEM', name: 'orgid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
,
porgid: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'porgid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
......@@ -662,39 +643,39 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性 enable 值
* 监控表单属性 porgid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof NewForm
*/
@Watch('data.enable')
onEnableChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'enable', newVal: newVal, oldVal: oldVal });
@Watch('data.porgid')
onPorgidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'porgid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 orgid 值
* 监控表单属性 enable 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof NewForm
*/
@Watch('data.orgid')
onOrgidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'orgid', newVal: newVal, oldVal: oldVal });
@Watch('data.enable')
onEnableChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'enable', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 porgid 值
* 监控表单属性 orgid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof NewForm
*/
@Watch('data.porgid')
onPorgidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'porgid', newVal: newVal, oldVal: oldVal });
@Watch('data.orgid')
onOrgidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'orgid', newVal: newVal, oldVal: oldVal });
}
......
app_web/src/widgets/ibzorganization/new-form-form/new-form-form-model.ts
浏览文件 @ 4fa89bb6
......@@ -70,6 +70,11 @@ export default class NewFormModel {
prop: 'parentorgname',
dataType: 'PICKUPTEXT',
},
{
name: 'porgid',
prop: 'parentorgid',
dataType: 'PICKUP',
},
{
name: 'enable',
prop: 'enable',
......@@ -80,11 +85,6 @@ export default class NewFormModel {
prop: 'orgid',
dataType: 'TEXT',
},
{
name: 'porgid',
prop: 'parentorgid',
dataType: 'PICKUP',
},
{
name: 'ibzorganization',
prop: 'orgid',
......
app_web/yarn.lock
浏览文件 @ 4fa89bb6
......@@ -2157,6 +2157,13 @@ axios@^0.19.1:
dependencies:
follow-redirects "1.5.10"
axios@^0.19.2:
version "0.19.2"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
dependencies:
follow-redirects "1.5.10"
babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
......@@ -3258,6 +3265,11 @@ core-js@^3.4.4:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
core-js@^3.6.4:
version "3.6.5"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
......@@ -4022,6 +4034,18 @@ element-ui@^2.13.0:
resize-observer-polyfill "^1.5.0"
throttle-debounce "^1.0.1"
element-ui@^2.13.2:
version "2.13.2"
resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.13.2.tgz#582bf47aaaaaafe23ea1958fae217a687ad06447"
integrity sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==
dependencies:
async-validator "~1.8.1"
babel-helper-vue-jsx-merge-props "^2.0.0"
deepmerge "^1.2.0"
normalize-wheel "^1.0.1"
resize-observer-polyfill "^1.5.0"
throttle-debounce "^1.0.1"
elliptic@^6.0.0:
version "6.5.2"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
......@@ -5209,10 +5233,10 @@ human-signals@^1.1.1:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
ibiz-gantt-elastic@^1.0.12:
version "1.0.12"
resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.12.tgz#6865ef41e94b8b31f00f4cd1f0f60f132f7398d3"
integrity sha512-UHmnTG5q13xUuCKXSf73ZpwN/iOM9M73jFQ+C9wJWAsZcrDVc/36bPaSalMcfRWpfWREtU9wMnONXtFGVvS6pw==
ibiz-gantt-elastic@^1.0.13:
version "1.0.13"
resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.13.tgz#420751337f7d4352df7f351a72ba0e13551bdf23"
integrity sha512-floFaw93UNo9y/9BAExApvz8ATuUuxv2bOUOUbj9jvqY5WkWFKo4C9Bmu4779M5foTHy6SGWItNgZnvbm8i0QQ==
dependencies:
dayjs "^1.8.16"
resize-observer-polyfill "^1.5.1"
......@@ -5220,6 +5244,17 @@ ibiz-gantt-elastic@^1.0.12:
vue-slider-component "^3.0.40"
vue-switches "^2.0.1"
ibiz-vue-lib@^0.1.7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/ibiz-vue-lib/-/ibiz-vue-lib-0.1.7.tgz#33d51fd08f9e527b5576910c7314f6803714ff37"
integrity sha512-EFreVH9JOVSyIZY/1ZRrIYYlfBWCEZnDKeAs1339SZa1IhaJ06kzpwziOENc4vzGBDh+ps11LJLAWrIjUEjVLQ==
dependencies:
axios "^0.19.2"
core-js "^3.6.4"
element-ui "^2.13.2"
view-design "^4.1.0"
vue "^2.6.11"
iconv-lite@0.4.24:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
......@@ -10185,7 +10220,7 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
vue@^2.2.6, vue@^2.6.10:
vue@^2.2.6, vue@^2.6.10, vue@^2.6.11:
version "2.6.11"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
......
config.xml
浏览文件 @ 4fa89bb6
......@@ -37,11 +37,6 @@
git clone -b master $para2 ibzou/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzou/
mvn clean package -Papi
cd ibzou-provider/ibzou-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 4fa89bb6
......@@ -4,7 +4,7 @@
<!--输出实体[IBZORG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzorg-430-1">
<changeSet author="a_A_5d9d78509" id="tab-ibzorg-431-1">
<createTable tableName="IBZORG">
<column name="ORGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZORG_ORGID"/>
......@@ -161,7 +161,7 @@
</changeSet>
<!--输出实体[IBZORG]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzorg-430-5">
<changeSet author="a_A_5d9d78509" id="fk-ibzorg-431-5">
<addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_IBZORG_IBZORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet>
<!--输出实体[IBZEMP]外键关系 -->
......
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
浏览文件 @ 4fa89bb6
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
EXPOSE 40001
EXPOSE 8081
ADD ibzou-provider-api.jar /ibzou-provider-api.jar
ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml
浏览文件 @ 4fa89bb6
......@@ -3,21 +3,9 @@ services:
ibzou-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
ports:
- "40001:40001"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=40001
- 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
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
deploy:
mode: replicated
replicas: 1
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或