Merge remote-tracking branch 'origin/main' into multi-tenant

src/views/perfManage/customTarget/index.vue

@@ -387,8 +387,10 @@ function fnModalOk() {
         message.error(t('views.perfManage.customTarget.expressionNoIdTip'), 3);
         return false;
       }
-      modalState.from.expression = result;
-      const from = toRaw(modalState.from);
+      //modalState.from.expression = result;
+      //const from = toRaw(modalState.from);
+      const from = { ...toRaw(modalState.from) };
+      from.expression = result;
       //return false;
       modalState.confirmLoading = true;
       const perfTask = from.id ? updateCustom(from) : addCustom(from);

src/views/perfManage/perfThreshold/index.vue

@@ -391,9 +391,7 @@ function fnRecordRun(row: Record<string, any>) {
       threRun(row).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {
           message.success({
-            content: t('common.msgSuccess', {
-              msg: t('views.configManage.softwareManage.runBtn'),
-            }),
+            content: 'Run',
             key,
             duration: 2,
           });
@@ -610,7 +608,7 @@ onMounted(() => {
             <a-space :size="8" align="center">
               <a-tooltip>
                 <template #title>
-                  {{ t('views.configManage.softwareManage.runBtn') }}
+                  Run
                 </template>
                 <a-button
                   type="link"

src/views/perfManage/taskManage/index.vue

@@ -616,9 +616,7 @@ function fnRecordRun(row: Record<string, any>) {
       taskRun(row).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {
           message.success({
-            content: t('common.msgSuccess', {
-              msg: t('views.configManage.softwareManage.runBtn'),
-            }),
+            content: 'Run',
             key,
             duration: 2,
           });
@@ -861,7 +859,7 @@ onMounted(() => {
                     >
                       <a-menu-item key="run">
                         <ThunderboltOutlined />
-                        {{ t('views.configManage.softwareManage.runBtn') }}
+                        Run
                       </a-menu-item>
                       <a-menu-item key="stop">
                         <UndoOutlined />