agentworkshop 0.7.53 → 0.7.58

package/app/components/app-header/UserChip.vue

@@ -1,150 +1,161 @@
-<script setup lang="ts">
-import type { MenuProps } from 'ant-design-vue'
-import { useUserStore } from '@/app/stores/workshop/user'
-
-const { t } = useI18n()
-const userStore = useUserStore()
-
-// 用户铭牌:真实身份(workshop 用户系统;未登录 = 访客)
-const userInitial = computed(() => (userStore.user?.name ?? '?').trim().charAt(0).toUpperCase())
-const userName = computed(() => userStore.user?.name ?? t('header.guest'))
-const userRole = computed(() => (userStore.isLoggedIn ? userStore.user?.role ?? 'user' : 'anonymous'))
-
-interface AvatarMenuEntry {
-  key: string
-  label: string
-  icon?: string
-  danger?: boolean
-  divider?: boolean
-}
-
-const avatarItems = computed<AvatarMenuEntry[]>(() => {
-  const items: AvatarMenuEntry[] = [
-    { key: 'tokens', icon: 'i-tabler-key', label: t('menu.tokens') },
-    { key: 'settings', icon: 'i-tabler-adjustments', label: t('menu.settings') },
-  ]
-  if (userStore.isLoggedIn) {
-    items.push({ key: 'd-logout', label: '', divider: true })
-    items.push({ key: 'logout', icon: 'i-tabler-logout', label: t('header.logout'), danger: true })
-  }
-  return items
-})
-
-const onAvatarMenu: MenuProps['onClick'] = async ({ key }) => {
-  if (key === 'settings') {
-    navigateTo('/settings')
-  }
-  else if (key === 'tokens') {
-    navigateTo('/tokens')
-  }
-  else if (key === 'logout') {
-    await userStore.logout()
-    navigateTo('/workshop')
-  }
-}
-</script>
-
-<template>
-  <a-dropdown>
-    <div class="user-chip">
-      <!-- 用户身份(session 异步解析)仅客户端可知:SSR 渲染中性占位,挂载后填充
-           —— 消除 hydration mismatch(unhead dispose 噪音的根因) -->
-      <ClientOnly>
-        <span class="user-initial aw-avatar">{{ userInitial }}</span>
-        <span class="user-meta">
-          <span class="user-name">{{ userName }}</span>
-          <span class="user-role">{{ userRole }}</span>
-        </span>
-        <template #fallback>
-          <span class="user-initial aw-avatar">·</span>
-          <span class="user-meta">
-            <span class="user-name">·</span>
-            <span class="user-role">·</span>
-          </span>
-        </template>
-      </ClientOnly>
-    </div>
-    <template #overlay>
-      <a-menu @click="onAvatarMenu">
-        <template
-          v-for="item in avatarItems"
-          :key="item.key"
-        >
-          <a-menu-divider v-if="item.divider" />
-          <a-menu-item
-            v-else
-            :key="item.key"
-            :danger="item.danger"
-          >
-            <span
-              :class="item.icon"
-              class="mr-2"
-            />
-            {{ item.label }}
-          </a-menu-item>
-        </template>
-      </a-menu>
-    </template>
-  </a-dropdown>
-</template>
-
-<style scoped>
-/* 操作者铭牌:头像 + 双行 */
-.user-chip {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  height: 42px;
-  margin-left: 4px;
-  padding: 0 12px 0 8px;
-  cursor: pointer;
-  border: 1px solid transparent;
-  border-radius: var(--radius-pill);
-  transition: border-color 0.16s ease, background 0.16s ease;
-}
-
-.user-chip:hover {
-  border-color: var(--line);
-  background: var(--hover-tint);
-}
-
-.user-initial {
-  width: 28px;
-  height: 28px;
-  font-size: 12px;
-}
-
-.user-meta {
-  display: flex;
-  flex-direction: column;
-  line-height: 1.15;
-}
-
-.user-name {
-  font-size: 12.5px;
-  font-weight: 600;
-  color: var(--app-text, var(--ink));
-  letter-spacing: 0.01em;
-}
-
-.user-role {
-  font-family: var(--font-mono);
-  /* 8.5px 是"看得见读不了"的下限之外(实测常驻被审计标红);
-     角色是身份信息,不是装饰刻度,抬到 9.5px 仍保持铭牌声部 */
-  font-size: 9.5px;
-  letter-spacing: 0.14em;
-  text-transform: uppercase;
-  color: var(--app-text-secondary, var(--ink-faint));
-}
-
-@media (max-width: 639px) {
-  .user-chip {
-    height: 38px;
-    padding: 0 6px;
-  }
-
-  .user-meta {
-    display: none;
-  }
-}
-</style>
+<script setup lang="ts">
+import type { MenuProps } from 'ant-design-vue'
+import { useUserStore } from '@/app/stores/workshop/user'
+import { useAuthUiStore } from '@/app/stores/workshop/auth-ui'
+
+const { t } = useI18n()
+const userStore = useUserStore()
+const authUi = useAuthUiStore()
+
+// 用户铭牌:真实身份(workshop 用户系统;未登录 = 访客)
+const userInitial = computed(() => (userStore.user?.name ?? '?').trim().charAt(0).toUpperCase())
+const userName = computed(() => userStore.user?.name ?? t('header.guest'))
+const userRole = computed(() => (userStore.isLoggedIn ? userStore.user?.role ?? 'user' : 'anonymous'))
+
+interface AvatarMenuEntry {
+  key: string
+  label: string
+  icon?: string
+  danger?: boolean
+  divider?: boolean
+}
+
+const avatarItems = computed<AvatarMenuEntry[]>(() => {
+  const items: AvatarMenuEntry[] = []
+  // 访客首项 = 登录(F2 修复:主壳此前无任何登录入口)
+  if (!userStore.isLoggedIn) {
+    items.push({ key: 'login', icon: 'i-tabler-login', label: t('header.login') })
+  }
+  items.push(
+    { key: 'tokens', icon: 'i-tabler-key', label: t('menu.tokens') },
+    { key: 'settings', icon: 'i-tabler-adjustments', label: t('menu.settings') },
+  )
+  if (userStore.isLoggedIn) {
+    items.push({ key: 'd-logout', label: '', divider: true })
+    items.push({ key: 'logout', icon: 'i-tabler-logout', label: t('header.logout'), danger: true })
+  }
+  return items
+})
+
+const onAvatarMenu: MenuProps['onClick'] = async ({ key }) => {
+  if (key === 'login') {
+    authUi.openLogin('manual')
+  }
+  else if (key === 'settings') {
+    navigateTo('/settings')
+  }
+  else if (key === 'tokens') {
+    navigateTo('/tokens')
+  }
+  else if (key === 'logout') {
+    await userStore.logout()
+    // 登出后留在当前页并弹出登录门(匿名态数据已隔离为 0,顺手给出进门通道)
+    authUi.openLogin('anonymous')
+  }
+}
+</script>
+
+<template>
+  <a-dropdown>
+    <div class="user-chip">
+      <!-- 用户身份(session 异步解析)仅客户端可知:SSR 渲染中性占位,挂载后填充
+           —— 消除 hydration mismatch(unhead dispose 噪音的根因) -->
+      <ClientOnly>
+        <span class="user-initial aw-avatar">{{ userInitial }}</span>
+        <span class="user-meta">
+          <span class="user-name">{{ userName }}</span>
+          <span class="user-role">{{ userRole }}</span>
+        </span>
+        <template #fallback>
+          <span class="user-initial aw-avatar">·</span>
+          <span class="user-meta">
+            <span class="user-name">·</span>
+            <span class="user-role">·</span>
+          </span>
+        </template>
+      </ClientOnly>
+    </div>
+    <template #overlay>
+      <a-menu @click="onAvatarMenu">
+        <template
+          v-for="item in avatarItems"
+          :key="item.key"
+        >
+          <a-menu-divider v-if="item.divider" />
+          <a-menu-item
+            v-else
+            :key="item.key"
+            :danger="item.danger"
+          >
+            <span
+              :class="item.icon"
+              class="mr-2"
+            />
+            {{ item.label }}
+          </a-menu-item>
+        </template>
+      </a-menu>
+    </template>
+  </a-dropdown>
+</template>
+
+<style scoped>
+/* 操作者铭牌:头像 + 双行 */
+.user-chip {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  height: 42px;
+  margin-left: 4px;
+  padding: 0 12px 0 8px;
+  cursor: pointer;
+  border: 1px solid transparent;
+  border-radius: var(--radius-pill);
+  transition: border-color 0.16s ease, background 0.16s ease;
+}
+
+.user-chip:hover {
+  border-color: var(--line);
+  background: var(--hover-tint);
+}
+
+.user-initial {
+  width: 28px;
+  height: 28px;
+  font-size: 12px;
+}
+
+.user-meta {
+  display: flex;
+  flex-direction: column;
+  line-height: 1.15;
+}
+
+.user-name {
+  font-size: 12.5px;
+  font-weight: 600;
+  color: var(--app-text, var(--ink));
+  letter-spacing: 0.01em;
+}
+
+.user-role {
+  font-family: var(--font-mono);
+  /* 8.5px 是"看得见读不了"的下限之外(实测常驻被审计标红);
+     角色是身份信息,不是装饰刻度,抬到 9.5px 仍保持铭牌声部 */
+  font-size: 9.5px;
+  letter-spacing: 0.14em;
+  text-transform: uppercase;
+  color: var(--app-text-secondary, var(--ink-faint));
+}
+
+@media (max-width: 639px) {
+  .user-chip {
+    height: 38px;
+    padding: 0 6px;
+  }
+
+  .user-meta {
+    display: none;
+  }
+}
+</style>

package/app/components/dcw/DcwAddNodeModal.vue

@@ -3,28 +3,34 @@
  * 添加控制节点向导 —— mock / 真实设备(协议参数 schema 动态表单 + 测试连接 + 数据语义标定)。
  * 向导各字段由页面 useDcwAddNode 独占持有,经 v-model 就地读写(与原模板写法一致);
  * 组件只负责呈现,测试/提交回抛页面。
+ * mes-rest 驱动额外提供「试读」(读链路验证,POST /dcw/mes-test-read;后端并行上线,404 容错)。
  */
+import { computed } from 'vue'
 import type { DcwTemplateDef } from '#shared/dcw-protocol'
 import type { DaqDriverCatalogEntry, DriverConfigField } from '#shared/daq-protocol'
 
-defineProps<{
+const props = defineProps<{
   templates: DcwTemplateDef[]
   driverCatalog: DaqDriverCatalogEntry[]
   addFields: DriverConfigField[]
   addTesting: boolean
   addTest: { ok: boolean, message: string } | null
+  addMesTesting: boolean
+  addMesResult: { ok: boolean, eng: number | null, ts: string | null, latencyMs: number | null, message: string } | null
+  addMesHookTesting: boolean
+  addMesHookResult: { ok: boolean, format: string, rows: number, message: string, summary: string } | null
   addSaving: boolean
   addError: string
 }>()
 
-const emit = defineEmits<{ test: [], submit: [] }>()
+const emit = defineEmits<{ 'test': [], 'mes-test': [], 'mes-hook-test': [], 'submit': [] }>()
 
 const { t } = useI18n()
 
 const addOpen = defineModel<boolean>('open', { required: true })
 const addScenario = defineModel<'mock' | 'real'>('scenario', { required: true })
 const addTemplate = defineModel<string>('template', { required: true })
-const addDriver = defineModel<'mock' | 'modbus-tcp' | 'opcua'>('driver', { required: true })
+const addDriver = defineModel<string>('driver', { required: true })
 const addName = defineModel<string>('name', { required: true })
 const addHold = defineModel<number | null>('hold', { required: true })
 const addRead = defineModel<number | null>('read', { required: true })
@@ -33,6 +39,31 @@ const addStepLimit = defineModel<number | null>('stepLimit', { required: true })
 const addCfg = defineModel<Record<string, string | number>>('cfg', { required: true })
 const addTransform = defineModel<{ kind: 'none' | 'linear', scale: number, offset: number }>('transform', { required: true })
 const addSemantics = defineModel<string>('semantics', { required: true })
+
+/** 映射表字段(type='text',如 readMap/writeMap/historyMap 的 JSON 多行输入 → textarea) */
+const isMapField = (f: DriverConfigField): boolean => f.type === 'text'
+
+/** 试读是否可用(仅 mes-rest 驱动展示) */
+const isMesRest = computed(() => addDriver.value === 'mes-rest')
+
+/** 试读内联结果文案:成功 = eng 值 + 耗时;失败 = 服务端/容错 message */
+const mesResultText = computed(() => {
+  const r = props.addMesResult
+  if (!r) return ''
+  if (r.ok) {
+    const eng = r.eng != null ? String(r.eng) : '--'
+    return `${eng}${r.latencyMs != null ? ` · ${r.latencyMs}ms` : ''}`
+  }
+  return r.message
+})
+
+/** 钩子试运行内联结果文案:格式+行数+hook 摘要/产物 */
+const mesHookResultText = computed(() => {
+  const r = props.addMesHookResult
+  if (!r) return ''
+  if (!r.ok) return r.message || r.summary
+  return `format=${r.format} rows=${r.rows} ${r.summary}`
+})
 </script>
 
 <template>
@@ -202,13 +233,21 @@ const addSemantics = defineModel<string>('semantics', { required: true })
             v-for="f in addFields"
             :key="f.key"
             class="f"
+            :class="{ 'map-field': isMapField(f) }"
           >
             <span>{{ f.label }}<em
               v-if="f.required"
               style="color: var(--tone-danger-dot); font-style: normal;"
             >*</em></span>
+            <textarea
+              v-if="isMapField(f)"
+              v-model="addCfg[f.key]"
+              class="inp cfg-map mono"
+              rows="6"
+              :placeholder="f.placeholder"
+            />
             <select
-              v-if="f.type === 'select'"
+              v-else-if="f.type === 'select'"
               v-model="addCfg[f.key]"
               class="inp"
             >
@@ -247,6 +286,42 @@ const addSemantics = defineModel<string>('semantics', { required: true })
             :class="addTest.ok ? 'good' : 'bad'"
           >{{ addTest.ok ? '✓' : '✗' }} {{ addTest.message }}</span>
         </div>
+        <!-- mes-rest 读链路试读(独立于写链路「测试连接」;后端端点并行上线,404 显示未就绪) -->
+        <div
+          v-if="isMesRest"
+          class="test-row"
+        >
+          <button
+            class="mini-btn"
+            :disabled="addMesTesting"
+            @click="emit('mes-test')"
+          >
+            {{ addMesTesting ? $t('dcwDetail.mesTesting') : $t('dcwDetail.mesTestBtn') }}
+          </button>
+          <span
+            v-if="addMesResult"
+            class="test-result"
+            :class="addMesResult.ok ? 'good' : 'bad'"
+          >{{ addMesResult.ok ? '✓' : '✗' }} {{ mesResultText }}</span>
+        </div>
+        <!-- mes-rest 数据钩子试运行(小窗口实拉 + dataHook 真实执行;产物落盘;404 容错) -->
+        <div
+          v-if="isMesRest"
+          class="test-row"
+        >
+          <button
+            class="mini-btn"
+            :disabled="addMesHookTesting"
+            @click="emit('mes-hook-test')"
+          >
+            {{ addMesHookTesting ? $t('dcwDetail.mesHookTesting') : $t('dcwDetail.mesHookTestBtn') }}
+          </button>
+          <span
+            v-if="addMesHookResult"
+            class="test-result"
+            :class="addMesHookResult.ok ? 'good' : 'bad'"
+          >{{ addMesHookResult.ok ? '✓' : '✗' }} {{ mesHookResultText }}</span>
+        </div>
       </template>
 
       <label class="f">
@@ -302,6 +377,9 @@ const addSemantics = defineModel<string>('semantics', { required: true })
 .seg.on { font-weight: 600; color: var(--on-accent); background: var(--accent); border-color: var(--accent); }
 .f-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 10px; margin-bottom: 10px; }
 .driver-form { grid-template-columns: repeat(3, 1fr); }
+/* 映射表字段(readMap/writeMap/historyMap 的 JSON 多行输入):整行铺满 + 等宽字体 */
+.driver-form .map-field { grid-column: 1 / -1; }
+.cfg-map { font-family: var(--font-mono); font-size: 11.5px; line-height: 1.5; resize: vertical; }
 
 .field-hint { font-size: 10px; color: var(--ink-faint); line-height: 1.35; }
 .f { display: flex; flex-direction: column; gap: 4px; font-size: 11.5px; color: var(--ink-faint); }