From 8a6f6544fbc56e9034b8e4b7f6c839660e173c70 Mon Sep 17 00:00:00 2001
From: wangpf <1305001440@qq.com>
Date: Fri, 2 Jun 2023 11:43:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E6=B8=85=E5=8D=95=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../4a62c61b-4812-4212-aee9-1eb134556d72.xml      |   4 ++--
 .../obj_4e95a7af7bf1414f9e878d013192675e.xml      |   5 +++--
 .../template/page/pal.pl.repository.designer.htm  |   6 +++---
 .../pal.pl.repository.designer.view.portal.html   |  10 ++++++----
 .../lib/designer/extend/css/designer.extend.css   |   7 +++++++
 .../lib/designer/extend/images/processlist.png    | Bin 0 -> 421 bytes
 6 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/images/processlist.png

diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/bo/_4a62c61b-4812-4212-aee9-1eb134556d72/4a62c61b-4812-4212-aee9-1eb134556d72.xml b/com.actionsoft.apps.coe.pal.publisher/repository/bo/_4a62c61b-4812-4212-aee9-1eb134556d72/4a62c61b-4812-4212-aee9-1eb134556d72.xml
index 620ae37b..e7031b39 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/bo/_4a62c61b-4812-4212-aee9-1eb134556d72/4a62c61b-4812-4212-aee9-1eb134556d72.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/bo/_4a62c61b-4812-4212-aee9-1eb134556d72/4a62c61b-4812-4212-aee9-1eb134556d72.xml
@@ -4,7 +4,7 @@
     <createUser>admin</createUser>
     <createTime>2022-07-27 14:42:37</createTime>
     <updateUser>admin</updateUser>
-    <updateTime>2023-05-22 18:39:55</updateTime>
+    <updateTime>2023-06-02 10:33:13</updateTime>
     <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrSZxfBQPLcrsqkct0Iu+0j/eRcugbUD89XPSXbDhspOrNlUsrZHPAbzKR13hnEzNv</signature>
     <managed>false</managed>
     <title>流程发布权限范围表</title>
@@ -138,7 +138,7 @@
             <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:全集团|0:部分人员","dataType":"sampleText","exportDataValidity":true}</componentSetting>
             <display>true</display>
             <deleted>false</deleted>
-            <modify>false</modify>
+            <modify>true</modify>
             <componentExtendCode></componentExtendCode>
             <persistenceType>ENTITY</persistenceType>
             <validateType></validateType>
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml
index f6df560f..ab7f9acc 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml
@@ -4,7 +4,7 @@
     <createUser>admin</createUser>
     <createTime>2023-05-31 18:03:32</createTime>
     <updateUser>admin</updateUser>
-    <updateTime>2023-05-31 19:23:43</updateTime>
+    <updateTime>2023-06-02 10:42:49</updateTime>
     <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrfBc9hqIASUfUE0oNnMJX+ec3gaaVRTOXkn+Q9j7jtPqago5GSsGy8ZiXG2WLXK9d</signature>
     <managed>false</managed>
     <version>1.0</version>
@@ -31,6 +31,7 @@
         </toolbar>
         <searcher id="obj_f2c309bd4ee54f7b96f20a37a91dcf28" isshow="true" layoutType="tile" tdGroup="4" tileLayout="y" textCls="" dwLeftCls="" dwRightCls="" extendcode="" event="" xconditionEvent="" tileOpen="false">
             <likecondition id="obj_7aacb67b0377496e8a2b6a62600c6b78" field="MODELID" extend1="" label="模型ID" comparetype="=" uiname="TEXT" relationship="" uidefault="" uicomponent="文本" uiref="" required="false" security="" orderindex="0" event=""/>
+            <likecondition id="obj_fa85844d64504d8896f0d011c146d15d" field="SHAPENAME" extend1="" label="形状名称" comparetype="like" uiname="TEXT" relationship="" uidefault="" uicomponent="文本" uiref="" required="false" security="" orderindex="1" event=""/>
         </searcher>
         <navTree id="obj_2eadfcc146fa4b6092f59bacf8c02e9a" isshow="false" type="" rootcls="" leafcls="" ismultiple="false" isexpanded="true" orderindex="" event=""/>
         <layout id="obj_1abd9daca1e9456dabb59ab053fc08b6" label="" classname="com.actionsoft.bpms.dw.exec.layout.LayoutA" event=""/>
@@ -38,7 +39,7 @@
             <dataBaseConn></dataBaseConn>
             <freezeField></freezeField>
             <column id="obj_99cb9a13d93644f4a3e3eb60a7b1bd04" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="175" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="MODELNAME" label="模型名称" orderindex="0" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_26817cc671cc4473bc2a895a53f2e99c" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="187" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="MODELTYPE" label="模型类型" orderindex="1" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_26817cc671cc4473bc2a895a53f2e99c" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="187" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="128" required="0" align="left" showrule="{&quot;type&quot;:&quot;NORMAL&quot;,&quot;cons&quot;:&quot;process_flowchart:泳道图|process_epc:EPC&quot;,&quot;showAdv&quot;:false}" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="MODELTYPE" label="模型类型" orderindex="1" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_f21a15ade71d4591a47cee41ff5c5bff" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="SHAPENAME" label="形状名称" orderindex="2" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_f6b3f3e3343743d492a0af6a3270aeed" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="SHAPETYPE" label="形状类型" orderindex="3" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_051fbc262a2241308e692a7ef6724b62" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="106" colALias="" colTableAlias="" colTable="BO_ACT_PAL_PROCESS_MANIFEST" length="3" required="0" align="right" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="SHAPENUMBER" label="形状编号" orderindex="4" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="NUMBER" handleType="0" boType="AWSUI.Number" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
index b8c077b9..789ec0f1 100755
--- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
+++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
@@ -823,9 +823,9 @@
                 <div id="QuickPublishing" awsui-qtip='快捷发布' class="toolbar_button">
                     <div class="ico quickPublish"></div>
                 </div>
-                <div id="processManifest" awsui-qtip='清单导出' class="toolbar_button">
-                    <i class="ico awsui-iconfont">&#xe682;</i>
-                    <!--<div class="ico quickPublish"></div>-->
+                <div id="processManifest" awsui-qtip='模型清单' class="toolbar_button">
+                    <!--<i class="ico awsui-iconfont">&#xe682;</i>-->
+                    <div class="ico processManifest"></div>
                 </div>
                 <!-- <div id="bar_import" awsui-qtip='导入' class="toolbar_button" style="<#importStyle>">
                     <div class="ico ico_import"></div>
diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
index 860f7eb0..2e5ec1bd 100755
--- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
+++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
@@ -644,8 +644,8 @@
             $('.newadd_portalAttr').css('overflow-y','auto');
             //$('#closeTab').hide();
             $('#tab').hide();
-            //	$("#designer_layout").height(newHeight);
-            $("#designer_layout").height(954);
+            //$("#designer_layout").height(newHeight);
+            $("#designer_layout").height( $("#designer_layout").height() + 82);
             $('#openTab').hide();
             $('#closeTab').show();
             $('#tab').css('display', 'inline-block');
@@ -653,8 +653,10 @@
             initProcessDesc();
             initPl();
             if(methodId=="data.form" || methodId=="control.policy"){
-                $("#designer_layout").height(994);
+                //$("#designer_layout").height(725);
+                $("#designer_layout").height( $("#designer_layout").height() + 93);
                 $(".suofang").hide();
+                $(".newadd_card .title").hide();
              changeUrl();
             }else {
                 $(".headerTab").css("margin-right" , "22px");
@@ -906,7 +908,7 @@
             width: 96%!important;
             padding-top: 20px;
         }
-        #pinglun{clear: both;overflow-y: scroll;overflow-c: hidden;height: 460px;}
+        #pinglun{clear: both;overflow-y: scroll;overflow-c: hidden;height: 139px;}
         .suofang{height:40px;background-color:white;border-top:1px solid #efefef;vertical-align:middle;position: relative;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px;}
         .processfiledown li{line-height: 20px;}
         .awsui-table td{border:0!important;}
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css
index 66b2678a..e38bb2b4 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css
@@ -216,6 +216,13 @@
 	background: url(../images/quickPublish.png) no-repeat;
 	background-size: contain;
 }
+
+.ico.processManifest{
+	background-position: 0px 0px;
+	background: url(../images/processlist.png) no-repeat;
+	background-size: contain;
+}
+
 .ico.extend_activityNoDisable{
 	background-position: 0px 0px;
 	background: url(../images/activityNoDisable.png) no-repeat;
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/images/processlist.png b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/images/processlist.png
new file mode 100644
index 0000000000000000000000000000000000000000..9aa925e711ba6be4ed4c2e86f8044b78c6216483
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Ur9tkR9HvVm+Nr?F${#4N&=mPN)jr8R032&QVCEA%r|pp?rw}F*~cUP2bSf%
z-L)*wG#m#>pQHb3e*Q{YNjh1JXT5-pq_wpmFwf=-E4~k4E9u)>5S;Jl&n|sS0O<GQ
z_|h*2V^s|7Is;i4Jd#xbz&x;E4NlA42m%1+{^;V)UG7`{XL#V40m>1DX}t=-P39Z`
zuLSqlN0wB~$e&}N2mpQdmH~`;44N1Y18CfPu)K-^GI&lw322i9=;J9wB@b|^{cj1T
z@<EjcyrsA#0nTrdz-%N8ic*QLVqhxzs~PZK$0Z4x3K8_TO3+jXUM@id04L^ev;YI9
z=Jw$x#4lq2;CUJVi>-$<Few1u1nKx#i9Pekvy3z(Bn1TRcI)66)AwP>RF?ZWvmKG=
zevbfSb3P{b)(iu<M0R$>h5_XII>$bDLuhz-FAUmpO9BjPJw!a92G{)+>ey}}%OV2|
P00000NkvXXu0mjfi$|>u

literal 0
HcmV?d00001