伊利客户反馈优化点修复

详情参考【优化项反馈-4.19】文档
This commit is contained in:
qinoy 2023-04-20 16:42:35 +08:00
parent 781a17337e
commit 87e84d6b37
22 changed files with 133 additions and 52 deletions

View File

@ -1,4 +1,4 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/favicon.ico><title>com.actionsoft.apps.coe.pal.cooperation</title><script src=../commons/awsui/js/icon.array.js></script><script>const settingParam = <#settingParam>;
const axiosBaseUrl = "./";
const production = true;</script><script>var mainPage = "<#mainPage>";
var isManage = <#isManage>;</script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-2df99908.8c979cf0.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-57c998ec.78e0eff0.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-809455de.29500759.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-2d224ef1.b2d73e77.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-2df99908.1ef58ba9.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-57c998ec.a3aa3950.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-809455de.a12419c0.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-bf7921b8.44b0a0f5.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.ad6bd664.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.9aa9e6da.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.568b7fcc.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.ad6bd664.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.568b7fcc.js></script><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.9aa9e6da.js></script></body></html>
var isManage = <#isManage>;</script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-232de7fe.19c1e2c0.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-6108bd12.b8460aa1.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-b0f79478.d45023c5.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-232de7fe.6b8bbb77.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-2d224ef1.2691561f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3a9b7577.1c8372d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-6108bd12.f93d6d29.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-b0f79478.f504de7b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.c75d9fae.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.bc4409f3.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.bc4409f3.js></script><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.c75d9fae.js></script></body></html>

View File

@ -0,0 +1 @@
#update[data-v-48a18669] .el-step__title{font-size:12px}#update[data-v-48a18669] .awsui-icon-picker-box1{border-radius:15%}.icon-team-div[data-v-48a18669]{height:70px;width:70px;line-height:70px;display:inline-block;position:absolute;z-index:2;right:30px;top:50px}.icon-team[data-v-48a18669]{color:#fff;font-size:52px}

View File

@ -1 +0,0 @@
#update[data-v-66b295aa] .el-step__title{font-size:12px}#update[data-v-66b295aa] .awsui-icon-picker-box1{border-radius:15%}.icon-team-div[data-v-66b295aa]{height:70px;width:70px;line-height:70px;display:inline-block;position:absolute;z-index:2;right:30px;top:50px}.icon-team[data-v-66b295aa]{color:#fff;font-size:52px}

View File

@ -1 +1 @@
#manageMain[data-v-ac2e0a1e] .awsui-dialog__body{padding-top:5px}#manageMain[data-v-ac2e0a1e] .awsui-icon-picker-box1{border-radius:15%}.team-item-div[data-v-ac2e0a1e]{height:46px;padding:6px 0 4px 0}.team-item-icon-div[data-v-ac2e0a1e]{position:relative;top:5px;width:32px;height:32px;line-height:32px;vertical-align:middle;text-align:center;border-radius:15%}.team-item-text-div[data-v-ac2e0a1e]{margin-left:7px;position:relative;top:12px}.team-item-text-div div[data-v-ac2e0a1e]{width:170px}.team-item-text-div div p[data-v-ac2e0a1e]{width:160px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.inline-block[data-v-ac2e0a1e]{display:inline-block}.cursor-pointer[data-v-ac2e0a1e]{cursor:pointer}.general-bgcolor-hover:hover .icon-drag[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .icon-drag[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .operate-icon-display[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .team-item-text-div p[data-v-ac2e0a1e]{color:#4e7ff9!important}.team-item-div-checked[data-v-ac2e0a1e]{color:#4e7ff9}.icon-team-div[data-v-ac2e0a1e]{position:absolute;right:40px;top:45px;z-index:2;height:70px;width:70px;line-height:70px;display:inline-block}.icon-team[data-v-ac2e0a1e]{color:#fff;font-size:52px}.required-logo[data-v-ac2e0a1e] label{margin-left:10px}#palRepositoryTree[data-v-dbb2ca8e] .el-dialog__body{padding:10px 20px;color:#606266;font-size:14px;word-break:break-all}#palRepositoryTree[data-v-dbb2ca8e] .el-input__inner{border-radius:0}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{background-color:#f5f7fa;color:#4e7ff9}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content .awsui-iconfont{color:#4e7ff9!important}.tree[data-v-dbb2ca8e]{overflow:auto;width:432px;height:300px}#palRepositoryTree[data-v-dbb2ca8e] .el-tree{min-width:100%;display:inline-block!important}.allGroup[data-v-162900f4]{display:flex}.allGroup .processAll[data-v-162900f4]{margin-left:5px}.allGroup .actionGroup[data-v-162900f4]{flex:1;text-align:right;padding-right:1px}#roleManage[data-v-5b5b40a9] .awsui-dialog__body{margin:0 16px}#roleManage[data-v-5b5b40a9] .role_data_perm_textarea textarea{cursor:pointer}.text-overflow-hidden[data-v-5b5b40a9]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.general-bgcolor-hover:hover .operate-icon-display[data-v-5b5b40a9]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-5b5b40a9]{display:none}#manageList[data-v-1de625d3] .awsui-main{padding:0 20px!important}#tableMain[data-v-1de625d3] .hideCheckBoxCell .el-checkbox__input{visibility:hidden}#tableMain[data-v-1de625d3] .el-table__header-wrapper .el-checkbox,#tableMain[data-v-1de625d3] .el-table__row .operate-icon-display{display:none}#tableMain[data-v-1de625d3] .el-table__row:hover .operate-icon-display,.inline-block[data-v-1de625d3]{display:inline-block}.team-icon-div[data-v-1de625d3]{text-align:center;border-radius:15%}.text-overflow-hidden[data-v-1de625d3]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#manage[data-v-eb099fd6] .awsui-aside,#manage[data-v-eb099fd6] .awsui-main{padding:0}
#manageMain[data-v-ac2e0a1e] .awsui-dialog__body{padding-top:5px}#manageMain[data-v-ac2e0a1e] .awsui-icon-picker-box1{border-radius:15%}.team-item-div[data-v-ac2e0a1e]{height:46px;padding:6px 0 4px 0}.team-item-icon-div[data-v-ac2e0a1e]{position:relative;top:5px;width:32px;height:32px;line-height:32px;vertical-align:middle;text-align:center;border-radius:15%}.team-item-text-div[data-v-ac2e0a1e]{margin-left:7px;position:relative;top:12px}.team-item-text-div div[data-v-ac2e0a1e]{width:170px}.team-item-text-div div p[data-v-ac2e0a1e]{width:160px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.inline-block[data-v-ac2e0a1e]{display:inline-block}.cursor-pointer[data-v-ac2e0a1e]{cursor:pointer}.general-bgcolor-hover:hover .icon-drag[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .icon-drag[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .operate-icon-display[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .team-item-text-div p[data-v-ac2e0a1e]{color:#4e7ff9!important}.team-item-div-checked[data-v-ac2e0a1e]{color:#4e7ff9}.icon-team-div[data-v-ac2e0a1e]{position:absolute;right:40px;top:45px;z-index:2;height:70px;width:70px;line-height:70px;display:inline-block}.icon-team[data-v-ac2e0a1e]{color:#fff;font-size:52px}.required-logo[data-v-ac2e0a1e] label{margin-left:10px}#palRepositoryTree[data-v-dbb2ca8e] .el-dialog__body{padding:10px 20px;color:#606266;font-size:14px;word-break:break-all}#palRepositoryTree[data-v-dbb2ca8e] .el-input__inner{border-radius:0}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{background-color:#f5f7fa;color:#4e7ff9}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content .awsui-iconfont{color:#4e7ff9!important}.tree[data-v-dbb2ca8e]{overflow:auto;width:432px;height:300px}#palRepositoryTree[data-v-dbb2ca8e] .el-tree{min-width:100%;display:inline-block!important}.allGroup[data-v-ffad861e]{display:flex}.allGroup .processAll[data-v-ffad861e]{margin-left:5px}.allGroup .actionGroup[data-v-ffad861e]{flex:1;text-align:right;padding-right:1px}#roleManage[data-v-5b5b40a9] .awsui-dialog__body{margin:0 16px}#roleManage[data-v-5b5b40a9] .role_data_perm_textarea textarea{cursor:pointer}.text-overflow-hidden[data-v-5b5b40a9]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.general-bgcolor-hover:hover .operate-icon-display[data-v-5b5b40a9]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-5b5b40a9]{display:none}#manageList[data-v-1de625d3] .awsui-main{padding:0 20px!important}#tableMain[data-v-1de625d3] .hideCheckBoxCell .el-checkbox__input{visibility:hidden}#tableMain[data-v-1de625d3] .el-table__header-wrapper .el-checkbox,#tableMain[data-v-1de625d3] .el-table__row .operate-icon-display{display:none}#tableMain[data-v-1de625d3] .el-table__row:hover .operate-icon-display,.inline-block[data-v-1de625d3]{display:inline-block}.team-icon-div[data-v-1de625d3]{text-align:center;border-radius:15%}.text-overflow-hidden[data-v-1de625d3]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#manage[data-v-eb099fd6] .awsui-aside,#manage[data-v-eb099fd6] .awsui-main{padding:0}

View File

@ -1 +1 @@
#update[data-v-66b295aa] .el-step__title{font-size:12px}#update[data-v-66b295aa] .awsui-icon-picker-box1{border-radius:15%}.icon-team-div[data-v-66b295aa]{height:70px;width:70px;line-height:70px;display:inline-block;position:absolute;z-index:2;right:30px;top:50px}.icon-team[data-v-66b295aa]{color:#fff;font-size:52px}#update[data-v-0d5b21cf] .el-main{display:block;flex:1;flex-basis:auto;overflow:auto;padding-top:20px;padding-left:20px;padding-right:0;padding-bottom:0}#update[data-v-0d5b21cf] .el-table__row .operate-icon-display{display:none}#update[data-v-0d5b21cf] .el-table__row:hover .operate-icon-display{display:inline-block}#update[data-v-0d5b21cf] .table-row-icon-cloumn .cell{padding-right:0!important}.icon-div-repository[data-v-0d5b21cf]{border-radius:15%;display:inline-block;width:32px;height:32px;text-align:center;line-height:32px;vertical-align:middle}.icon-dynamic-repository[data-v-0d5b21cf]{color:#fff;font-size:18px}
#update[data-v-48a18669] .el-step__title{font-size:12px}#update[data-v-48a18669] .awsui-icon-picker-box1{border-radius:15%}.icon-team-div[data-v-48a18669]{height:70px;width:70px;line-height:70px;display:inline-block;position:absolute;z-index:2;right:30px;top:50px}.icon-team[data-v-48a18669]{color:#fff;font-size:52px}#update[data-v-0d5b21cf] .el-main{display:block;flex:1;flex-basis:auto;overflow:auto;padding-top:20px;padding-left:20px;padding-right:0;padding-bottom:0}#update[data-v-0d5b21cf] .el-table__row .operate-icon-display{display:none}#update[data-v-0d5b21cf] .el-table__row:hover .operate-icon-display{display:inline-block}#update[data-v-0d5b21cf] .table-row-icon-cloumn .cell{padding-right:0!important}.icon-div-repository[data-v-0d5b21cf]{border-radius:15%;display:inline-block;width:32px;height:32px;text-align:center;line-height:32px;vertical-align:middle}.icon-dynamic-repository[data-v-0d5b21cf]{color:#fff;font-size:18px}

View File

@ -1 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e._self._c;return s("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),i=t("0f08"),o=t("4360");i["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误"+e.msg):(o["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"+mainPage))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("e607"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e._self._c;return s("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),i=t("0f08"),o=t("4360");i["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误"+e.msg):(o["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"+mainPage))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("2877"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);

View File

@ -364,6 +364,48 @@ public class PALRepositoryPropertyDao extends DaoObject<PALRepositoryPropertyMod
return r;
}
public boolean updateProperties(List<PALRepositoryPropertyModel> properties) throws SQLException {
boolean completeSuccess = false;
if (properties != null && properties.size() > 0){
Connection conn = DBSql.open();
PreparedStatement ps = null;
ResultSet resultSet = null;
try {
conn.setAutoCommit(false);
String sql = "update " + entityName() + " set " + PALRepositoryPropertyModel.FIELD_PROPERTYVALUE + " =? "
+ " where " + PALRepositoryPropertyModel.FIELD_PROPERTYID + " =? and "
+ PALRepositoryPropertyModel.FIELD_PLID + " != ? ";
ps = conn.prepareStatement(sql);
for (PALRepositoryPropertyModel property : properties) {
ps.setString(1, property.getPropertyValue());
ps.setString(2, property.getPropertyId());
ps.setString(3, property.getPlId());
ps.addBatch();
}
int[] rs = ps.executeBatch();
for (int i = 0; i < rs.length; i++) {
if ((rs[i] >= 0) || (rs[i] == PreparedStatement.SUCCESS_NO_INFO)) {
completeSuccess = true;
}
}
if (completeSuccess){
conn.commit();
PALRepositoryPropertyCache.getCache().load();
}else {
conn.rollback();
}
} catch (SQLException e) {
conn.rollback();
}finally {
DBSql.close(conn, ps, resultSet);
}
}
return completeSuccess;
}
/**
* 更新流程的所有自定义属性
* @param propertys

View File

@ -5123,6 +5123,40 @@ public class CoeProcessLevelWeb extends ActionWeb {
if (title.equals(model.getName())) {
return ResponseObject.newOkResponse().toString();
}
String finalTitle = title;
new Thread(() -> {
// 如果该文件被引用则同步更新 相关文件以及支持文件属性
PALRepositoryPropertyDao propertyDao = new PALRepositoryPropertyDao();
try {
List<PALRepositoryPropertyModel> supportFiles =
propertyDao.query(PALRepositoryPropertyModel.FIELD_PROPERTYID + " in ('support_files','R_relevant_flies') and " + PALRepositoryPropertyModel.FIELD_PLID + " != ? ", uuid).list();
List<PALRepositoryPropertyModel> updateList = new ArrayList<>();
for (PALRepositoryPropertyModel propertyModel : supportFiles) {
if (UtilString.isNotEmpty(propertyModel.getPropertyValue())){
JSONObject supportFileObj = JSONObject.parseObject(propertyModel.getPropertyValue());
String relationFileId = supportFileObj.getString("relationFileId");
String relationShapeText = supportFileObj.getString("relationShapeText");
if (relationFileId.contains(uuid) && relationShapeText.contains(model.getName())){
relationShapeText.replaceAll(model.getName(), finalTitle);
supportFileObj.put("relationShapeText",relationShapeText);
propertyModel.setPropertyValue(supportFileObj.toJSONString());
updateList.add(propertyModel);
}
}
}
if (updateList.size() > 0){
propertyDao.updateProperties(updateList);
}
} catch (SQLException e) {
e.printStackTrace();
ConsolePrinter.err("模型名称同步更新报错");
}
ConsolePrinter.info("模型名称同步更新完成");
}).start();
model.setName(title);
String uid = super.getContext().getUID();
Timestamp nowTime = new Timestamp(System.currentTimeMillis());