agentworkshop 0.7.41 → 0.7.44

package/app/components/workshop/town/TownView.vue

@@ -1407,29 +1407,29 @@ const daq = useDaqStream()
 /** 智控流单例(写控制;与数采对称:模板目录/节点/场景/绑定) */
 const dcw = useDcwStream()
 /** 智控模板目录(server 权威;与 daqTemplates 同构投影) */
-const dcwTemplates = reactive(dcw.templates.map(t => ({
-  id: t.key,
-  name: t.name,
-  code: t.code,
-  ch: t.ch,
-  unit: t.unit,
-  min: t.min,
-  max: t.max,
-  decimals: t.decimals,
-  icon: t.icon,
+const dcwTemplates = reactive(dcw.templates.map(tpl => ({
+  id: tpl.key,
+  name: catalogTplName(t, tpl),
+  code: tpl.code,
+  ch: tpl.ch,
+  unit: tpl.unit,
+  min: tpl.min,
+  max: tpl.max,
+  decimals: tpl.decimals,
+  icon: tpl.icon,
 })))
 watch(() => dcw.templates, (list) => {
   if (!list?.length) return
-  dcwTemplates.splice(0, dcwTemplates.length, ...list.map(t => ({
-    id: t.key,
-    name: t.name,
-    code: t.code,
-    ch: t.ch,
-    unit: t.unit,
-    min: t.min,
-    max: t.max,
-    decimals: t.decimals,
-    icon: t.icon,
+  dcwTemplates.splice(0, dcwTemplates.length, ...list.map(tpl => ({
+    id: tpl.key,
+    name: catalogTplName(t, tpl),
+    code: tpl.code,
+    ch: tpl.ch,
+    unit: tpl.unit,
+    min: tpl.min,
+    max: tpl.max,
+    decimals: tpl.decimals,
+    icon: tpl.icon,
   })))
 }, { immediate: true, deep: true })
 /** 左轨树形目录:模板 = 可展开分组(不可拖拽),节点 = 可拖入场景的叶子。
@@ -1523,33 +1523,33 @@ interface DaqTemplate {
   /** 图标(设计稿 ICONS 键) */
   icon: string
 }
-const daqTemplates = reactive<DaqTemplate[]>(DAQ_TEMPLATES.map(t => ({
-  id: t.key,
-  name: t.name,
-  code: t.code,
-  ch: t.ch,
-  unit: t.unit,
-  base: t.base,
-  amp: t.amp,
-  min: t.min,
-  max: t.max,
-  decimals: t.decimals,
-  icon: t.icon,
+const daqTemplates = reactive<DaqTemplate[]>(DAQ_TEMPLATES.map(tpl => ({
+  id: tpl.key,
+  name: catalogTplName(t, tpl),
+  code: tpl.code,
+  ch: tpl.ch,
+  unit: tpl.unit,
+  base: tpl.base,
+  amp: tpl.amp,
+  min: tpl.min,
+  max: tpl.max,
+  decimals: tpl.decimals,
+  icon: tpl.icon,
 })))
 watch(() => daq.templates, (list) => {
   if (!list?.length) return
-  daqTemplates.splice(0, daqTemplates.length, ...list.map(t => ({
-    id: t.key,
-    name: t.name,
-    code: t.code,
-    ch: t.ch,
-    unit: t.unit,
-    base: t.base,
-    amp: t.amp,
-    min: t.min,
-    max: t.max,
-    decimals: t.decimals,
-    icon: t.icon,
+  daqTemplates.splice(0, daqTemplates.length, ...list.map(tpl => ({
+    id: tpl.key,
+    name: catalogTplName(t, tpl),
+    code: tpl.code,
+    ch: tpl.ch,
+    unit: tpl.unit,
+    base: tpl.base,
+    amp: tpl.amp,
+    min: tpl.min,
+    max: tpl.max,
+    decimals: tpl.decimals,
+    icon: tpl.icon,
   })))
 }, { immediate: true, deep: true })
 const daqTplById = (ref: string): DaqTemplate | undefined => {
@@ -2969,7 +2969,7 @@ onBeforeUnmount(() => {
         <button
           class="nav-action"
           :disabled="mode !== 'edit'"
-          :title="mode === 'edit' ? '把全部设备的位置/朝向/缩放写入数据库' : '运行模式只读'"
+          :title="mode === 'edit' ? $t('townView.saveLayoutTip') : $t('townView.readonlyTip')"
           @click="saveLayout"
         >
           {{ $t('townView.k1b3bk8t029') }}
@@ -3051,7 +3051,7 @@ onBeforeUnmount(() => {
           <button
             type="button"
             class="sheet-x"
-            aria-label="关闭"
+            :aria-label="$t('common.close')"
             @click="closeSheet"
           >
             ✕
@@ -3075,7 +3075,7 @@ onBeforeUnmount(() => {
             <button
               class="daq-ctl-btn"
               :class="{ on: daq.controller.running }"
-              :title="daq.controller.running ? '暂停全部采集:停止所有启用节点的采样(节点级启停独立)' : '恢复全部采集:仅启用节点恢复采集(手动停用的保持停用)'"
+              :title="daq.controller.running ? $t('townView.daqPauseTip') : $t('townView.daqResumeTip')"
               @click="daq.controllerAction(daq.controller.running ? 'pause' : 'resume')"
             >
               {{ daq.controller.running ? $t('townView.k3w3j8f140') : $t('townView.k3n93ed175') }}
@@ -3271,7 +3271,7 @@ onBeforeUnmount(() => {
               :class="{ active: ch.placed }"
               :draggable="!ch.placed && mode === 'edit'"
               :data-channel-id="ch.channelId"
-              :title="ch.placed ? '已在场景中,点击定位' : '拖拽到场景放置'"
+              :title="ch.placed ? $t('townView.chPlaced') : $t('townView.chDragHint')"
               @dragstart="ch.placed ? undefined : onChannelDragStart($event, ch.channelId)"
               @click="onDockCardClick(ch)"
             >
@@ -3388,13 +3388,13 @@ onBeforeUnmount(() => {
                 {{ $t('townView.kv72860036') }}
               </option>
               <option value="top">
-                俯视 · TOP
+                {{ $t('townView.viewTop') }}
               </option>
               <option value="front">
-                前视 · FRONT
+                {{ $t('townView.viewFront') }}
               </option>
               <option value="side">
-                侧视 · SIDE
+                {{ $t('townView.viewSide') }}
               </option>
             </select>
           </div>
@@ -3948,7 +3948,7 @@ onBeforeUnmount(() => {
           <button
             type="button"
             class="sheet-x"
-            aria-label="关闭"
+            :aria-label="$t('common.close')"
             @click="closeSheet"
           >
             ✕
@@ -4188,7 +4188,7 @@ onBeforeUnmount(() => {
                     class="obj-input"
                     :placeholder="$t('townView.k1k6vbaf015')"
                     :disabled="mode !== 'edit'"
-                    :title="mode === 'edit' ? '设备名称' : '运行模式只读'"
+                    :title="mode === 'edit' ? $t('townView.deviceName') : $t('townView.readonlyTip')"
                     @change="onObjNameCommit"
                     @keydown.enter="onObjNameCommit"
                   >
@@ -4206,7 +4206,7 @@ onBeforeUnmount(() => {
                       :key="m.id"
                       :value="m.id"
                     >
-                      {{ m.name }}
+                      {{ townModelName(t, m) }}
                     </option>
                   </select>
                 </div>
@@ -4432,7 +4432,7 @@ onBeforeUnmount(() => {
                 <!-- 变换模式(Blender G/R/S;仅编辑模式) -->
                 <template v-if="mode === 'edit'">
                   <div class="sect-hd">
-                    变换 · BLENDER
+                    {{ $t('townView.transformBlender') }}
                   </div>
                   <div class="xz-seg">
                     <button
@@ -4595,7 +4595,7 @@ onBeforeUnmount(() => {
                 v-if="!agentBindings.length"
                 class="ins-empty"
               >
-                未绑定工业节点 —— 绑定后 Agent 可用 dcw_control / daq_query 工具
+                {{ $t('townView.unboundTip') }}
               </div>
               <div
                 v-if="mode === 'edit'"

package/app/middleware/locale-cookie.global.ts

@@ -0,0 +1,22 @@
+/**
+ * locale cookie 参与 SSR 首帧(与 aw-theme cookie 同一范式)。
+ *
+ * 为什么必须有:strategy=no_prefix + detectBrowserLanguage=false 下 SSR 恒以 zh 渲染,
+ * 客户端 locale 恢复(locale-restore 插件)是异步的 —— 若 setLocale 在水合前落地,
+ * prod 水合不修正属性失配(文本会被修正,placeholder 这类 attr 不会),
+ * 登录卡输入框曾在 EN 模式下残留中文占位符。cookie 服务端可读,两侧渲染一致,竞态消失。
+ *
+ * 键名与 localStorage 的 'aw.locale' 同名:header/settings 切换时双写,
+ * 本中间件(SSR + 客户端首航都跑)据此在渲染前把 locale 定住。
+ */
+export default defineNuxtRouteMiddleware(async () => {
+  const cookie = useCookie<string | undefined>('aw.locale')
+  const saved = cookie.value
+  if (saved !== 'en' && saved !== 'zh-CN') return
+  const $i18n = (useNuxtApp() as unknown as {
+    $i18n?: { locale: { value: string }, setLocale: (l: string) => Promise<unknown> }
+  }).$i18n
+  if (!$i18n) return
+  // 必须 await:setLocale 未落地就开始渲染的话,SSR 仍是 zh,水合失配回归
+  if (saved !== $i18n.locale.value) await $i18n.setLocale(saved)
+})

package/app/pages/aml/index.vue

@@ -304,6 +304,28 @@ const pythonText = computed(() => {
 const venvText = computed(() =>
   overview.value ? (overview.value.runtime.venvReady ? tt('aml.k1amlx007') : tt('aml.k1amlx008')) : '--')
 
+/** 服务端 blocker 是中文数据:已知固定文案映射 i18n,未知(动态 reason)原样透传 */
+const AML_BLOCKER_KEYS: Record<string, string> = {
+  '训练环境(./aml/.venv)尚未创建:请在「运行环境」面板点击「创建训练环境」': 'aml.blockerVenv',
+  'Python 解释器不可用': 'aml.blockerPython',
+}
+const blockerText = computed(() =>
+  (env.value?.preflight?.blockers ?? [])
+    .map(b => (AML_BLOCKER_KEYS[b] ? tt(AML_BLOCKER_KEYS[b]) : b))
+    .join(' / '))
+
+/** 数据根来源按 amlRootMode 翻译(amlRootSource 是服务端中文标签) */
+const AML_ROOT_SOURCE_KEYS: Record<string, string> = {
+  env: 'aml.rootSourceEnv',
+  repo: 'aml.rootSourceRepo',
+  home: 'aml.rootSourceHome',
+}
+const rootSourceLabel = computed(() => {
+  const mode = env.value?.amlRootMode ?? ''
+  const key = AML_ROOT_SOURCE_KEYS[mode]
+  return key ? tt(key) : (env.value?.amlRootSource ?? '')
+})
+
 // ---------- 1b. 运行环境(uv 检测 / 一键安装 / .venv 供给) ----------
 
 /** 完整环境状态(GET /env);比 overview.env 多出任务日志与目录明细 */
@@ -964,7 +986,7 @@ async function doPredict(): Promise<void> {
       >
         <span class="i-tabler-alert-triangle" />
         <span class="txt">
-          {{ $t('aml.k1amlx178') }}:<b class="mono">{{ env.preflight.blockers.join(' / ') }}</b>
+          {{ $t('aml.k1amlx178') }}:<b class="mono">{{ blockerText }}</b>
         </span>
       </div>
 
@@ -1059,7 +1081,7 @@ async function doPredict(): Promise<void> {
           <p class="ec-detail">
             {{ $t('aml.k1amlx174') }}:
             <b class="mono">{{ env.disk.usedMb }} / {{ env.disk.quotaMb }} MB</b>
-            <span class="dim"> · {{ env.amlRootSource }}</span>
+            <span class="dim"> · {{ rootSourceLabel }}</span>
           </p>
         </div>
 

package/app/pages/daq/[id].vue

@@ -29,7 +29,7 @@ const tpl = computed(() => {
   const key = node.value ? daqKeyFromRef(node.value.templateRef) : ''
   return daq.templates.find(t => t.key === key) ?? null
 })
-const stateLabel: Record<DaqNodeState, string> = { ok: t('daqDetail.k41k5c026'), warn: t('daqDetail.k49z8v027'), alarm: t('daqDetail.k3xmid028'), offline: t('daqDetail.k44c2n029') }
+const stateLabel = computed<Record<DaqNodeState, string>>(() => ({ ok: t('daqDetail.k41k5c026'), warn: t('daqDetail.k49z8v027'), alarm: t('daqDetail.k3xmid028'), offline: t('daqDetail.k44c2n029') }))
 const effectiveState = (): DaqNodeState => {
   const n = node.value
   if (!n) return 'offline'
@@ -219,13 +219,13 @@ type ChartRow = DaqTsdbPoint
 const historyPoints = ref<ChartRow[]>([])
 const bucketMs = ref<number>(15000)
 const histLoading = ref(false)
-const BUCKETS = [
-  { label: '1s 桶', ms: 1000 },
-  { label: '5s 桶', ms: 5000 },
-  { label: '15s 桶(默认)', ms: 15000 },
-  { label: '30s 桶', ms: 30000 },
-  { label: '1min 桶', ms: 60000 },
-]
+const BUCKETS = computed(() => [
+  { label: t('daqDetail.bucket1s'), ms: 1000 },
+  { label: t('daqDetail.bucket5s'), ms: 5000 },
+  { label: t('daqDetail.bucket15s'), ms: 15000 },
+  { label: t('daqDetail.bucket30s'), ms: 30000 },
+  { label: t('daqDetail.bucket60s'), ms: 60000 },
+])
 async function loadHistory(): Promise<void> {
   if (!nodeId.value) return
   histLoading.value = true
@@ -545,7 +545,7 @@ watch(effectiveRefreshMs, () => armHistTimer())
               type="button"
               class="toggle slim"
               :class="{ on: form.calKind === 'linear' }"
-              title="采集标定 decoder:物理值 = scale × PLC采集值 + offset"
+              :title="$t('daqDetail.calDecoderTip')"
               @click="form.calKind = form.calKind === 'linear' ? 'none' : 'linear'"
             >
               {{ form.calKind === 'linear' ? $t('daqDetail.k1eru4r1039') : $t('daqDetail.k3oktae047') }}
@@ -556,7 +556,7 @@ watch(effectiveRefreshMs, () => armHistTimer())
               step="0.1"
               class="input"
               :disabled="form.calKind !== 'linear'"
-              title="decode 斜率(≠0)"
+              :title="$t('daqDetail.calScaleTip')"
             >
             <input
               v-model.number="form.calOffset"
@@ -564,7 +564,7 @@ watch(effectiveRefreshMs, () => armHistTimer())
               step="0.1"
               class="input"
               :disabled="form.calKind !== 'linear'"
-              title="decode 截距"
+              :title="$t('daqDetail.calOffsetTip')"
             ><small>decoder</small>
           </label>
           <label class="field row">