Skip to content

Commit 7ca3d79

Browse files
committed
fix: Many errors
1 parent b0120c7 commit 7ca3d79

File tree

6 files changed

+29
-8
lines changed

6 files changed

+29
-8
lines changed

apps/common/constants/permission_constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def get_workspace_role(self):
375375
Operate.TRIGGER_CREATE.value: _('Create Trigger'),
376376
Operate.TRIGGER_EDIT.value: _('Edit Trigger'),
377377
Operate.TRIGGER_DELETE.value: _('Delete Trigger'),
378-
Operate.RECORD.value: _('Execute record'),
378+
Operate.RECORD.value: _('Read execute record'),
379379

380380
Group.APPLICATION_OVERVIEW.value: _('Overview'),
381381
Group.APPLICATION_ACCESS.value: _('Application Access'),

apps/locales/en_US/LC_MESSAGES/django.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9125,7 +9125,7 @@ msgstr ""
91259125
msgid "Delete Trigger"
91269126
msgstr ""
91279127

9128-
msgid "Execute record"
9128+
msgid "Read execute record"
91299129
msgstr ""
91309130

91319131
msgid "ADMIN"

apps/locales/zh_CN/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9248,8 +9248,8 @@ msgstr "编辑触发器"
92489248
msgid "Delete Trigger"
92499249
msgstr "删除触发器"
92509250

9251-
msgid "Execute record"
9252-
msgstr "执行记录"
9251+
msgid "Read execute record"
9252+
msgstr "查看执行记录"
92539253

92549254
msgid "ADMIN"
92559255
msgstr "系统管理员"

apps/locales/zh_Hant/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9245,8 +9245,8 @@ msgstr "編輯觸發器"
92459245
msgid "Delete Trigger"
92469246
msgstr "刪除觸發器"
92479247

9248-
msgid "Execute record"
9249-
msgstr "執行記錄"
9248+
msgid "Read execute record"
9249+
msgstr "檢視執行記錄"
92509250

92519251
msgid "ADMIN"
92529252
msgstr "系統管理員"

ui/src/views/system-resource-management/ApplicationResourceIndex.vue

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,13 @@
284284
<AppIcon iconName="app-export" class="color-secondary"></AppIcon>
285285
{{ $t('common.export') }}
286286
</el-dropdown-item>
287+
<el-dropdown-item
288+
@click.stop="openTriggerDrawer(row)"
289+
v-if="row.is_publish && permissionPrecise.trigger_read()"
290+
>
291+
<AppIcon iconName="app-trigger" class="color-secondary"></AppIcon>
292+
{{ $t('views.trigger.title') }}
293+
</el-dropdown-item>
287294
<el-dropdown-item
288295
@click.stop="deleteApplication(row)"
289296
v-if="permissionPrecise.delete()"
@@ -302,6 +309,10 @@
302309
:type="SourceTypeEnum.APPLICATION"
303310
ref="ResourceAuthorizationDrawerRef"
304311
/>
312+
<ResourceTriggerDrawer
313+
ref="resourceTriggerDrawerRef"
314+
:source="SourceTypeEnum.APPLICATION"
315+
></ResourceTriggerDrawer>
305316
</div>
306317
</template>
307318

@@ -312,6 +323,7 @@ import ApplicationResourceApi from '@/api/system-resource-management/application
312323
import ResourceAuthorizationDrawer from '@/components/resource-authorization-drawer/index.vue'
313324
import { t } from '@/locales'
314325
import { isAppIcon, resetUrl } from '@/utils/common'
326+
import ResourceTriggerDrawer from '@/views/trigger/ResourceTriggerDrawer.vue'
315327
import useStore from '@/stores'
316328
import { datetimeFormat } from '@/utils/time'
317329
import { loadPermissionApi } from '@/utils/dynamics-api/permission-api.ts'
@@ -347,6 +359,11 @@ const MoreFilledPermission = () => {
347359
)
348360
}
349361
362+
const resourceTriggerDrawerRef = ref<InstanceType<typeof ResourceTriggerDrawer>>()
363+
const openTriggerDrawer = (data: any) => {
364+
resourceTriggerDrawerRef.value?.open(data)
365+
}
366+
350367
const ResourceAuthorizationDrawerRef = ref()
351368
352369
function openAuthorization(item: any) {

ui/src/views/system-resource-management/ToolResourceIndex.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,11 @@
332332

333333
<el-dropdown-item
334334
@click.stop="openTriggerDrawer(row)"
335-
v-if="row.tool_type === 'CUSTOM' && permissionPrecise.trigger_read()"
335+
v-if="
336+
row.tool_type === 'CUSTOM' &&
337+
permissionPrecise.trigger_read() &&
338+
row.is_active
339+
"
336340
>
337341
<AppIcon iconName="app-trigger" class="color-secondary"></AppIcon>
338342
{{ $t('views.trigger.title') }}
@@ -348,7 +352,7 @@
348352
<el-dropdown-item
349353
text
350354
@click.stop="openToolRecordDrawer(row)"
351-
v-if="permissionPrecise.relate_map()"
355+
v-if="permissionPrecise.record()"
352356
>
353357
<AppIcon iconName="app-schedule-report" class="color-secondary" />
354358
{{ $t('common.ExecutionRecord.subTitle') }}

0 commit comments

Comments
 (0)