From 08a77425dd47c9e47935febfa9e2bcf260459907 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 7 May 2025 16:15:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E5=85=B3=E8=81=94]#[1415977420423168]?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85-=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?=
 =?UTF-8?q?l/939050947543040/939050947543042/1415977420423168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/task/processdetail/workorder/common/button-bar.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue b/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue
index 79d8ba772..c1d114c3f 100644
--- a/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue
+++ b/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue
@@ -104,7 +104,7 @@
             {{ actionConfig.copyprocesstask }}
           </DropdownItem>
           <!-- 编辑表单 -->
-          <DropdownItem v-if="processTaskConfig && processTaskConfig.formConfig && $AuthUtils.hasRole('PROCESSTASK_MODIFY')" @click.native="editForm()">
+          <DropdownItem v-if="processTaskConfig && processTaskConfig.formConfig && $AuthUtils.hasRole('PROCESSTASK_MODIFY') && actionConfig.update" @click.native="editForm()">
             {{ $t('dialog.title.edittarget',{'target':$t('page.form')}) }}
           </DropdownItem>
           <!-- 转为知识 -->
-- 
Gitee


From 5f4e21133b914d16de0a9cce005016189a94f7b7 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 7 May 2025 16:34:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1415977420423168]?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85-=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?=
 =?UTF-8?q?l/939050947543040/939050947543042/1415977420423168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/task/processdetail/workorder/common/button-bar.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue b/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue
index c1d114c3f..4b28b7ec6 100644
--- a/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue
+++ b/src/views/pages/process/task/processdetail/workorder/common/button-bar.vue
@@ -104,7 +104,7 @@
             {{ actionConfig.copyprocesstask }}
           </DropdownItem>
           <!-- 编辑表单 -->
-          <DropdownItem v-if="processTaskConfig && processTaskConfig.formConfig && $AuthUtils.hasRole('PROCESSTASK_MODIFY') && actionConfig.update" @click.native="editForm()">
+          <DropdownItem v-if="processTaskConfig && processTaskConfig.formConfig && ($AuthUtils.hasRole('PROCESSTASK_MODIFY') || actionConfig.update)" @click.native="editForm()">
             {{ $t('dialog.title.edittarget',{'target':$t('page.form')}) }}
           </DropdownItem>
           <!-- 转为知识 -->
-- 
Gitee


From 6301a5eaaa66099cf4860ae351b88f7ca6520dc0 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 7 May 2025 17:07:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=AD=EF=BC=8C=E7=BB=A7=E6=89=BF=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form/config/formpassword-conf.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/resources/plugins/TsSheet/form/config/formpassword-conf.vue b/src/resources/plugins/TsSheet/form/config/formpassword-conf.vue
index 64ae12a81..c5c78c42e 100644
--- a/src/resources/plugins/TsSheet/form/config/formpassword-conf.vue
+++ b/src/resources/plugins/TsSheet/form/config/formpassword-conf.vue
@@ -26,6 +26,7 @@
         :multiple="true"
         :transfer="true"
         :groupList="['user', 'role', 'team']"
+        :disabled="disabled"
         @on-change="val => {
           setConfig('viewPasswordAuthorityList', val);
         }"
-- 
Gitee