dsh-ponlay-erp 1.8.0 → 1.8.1

package/client.js

@@ -26,6 +26,11 @@ window.__ModuleLoader__.load({
 
     const delay = (ms) => new Promise((resolve) => window.setTimeout(resolve, ms))
 
+    function activeLang(localeFace) {
+      const id = String(localeFace.getSnapshot().active || '').toLowerCase()
+      return id.startsWith('zh') ? 'zh' : 'en'
+    }
+
     // ---------------------------------------------------------------
     // Dictionaries
     // ---------------------------------------------------------------
@@ -36,6 +41,7 @@ window.__ModuleLoader__.load({
       'status.loading': 'Connecting…',
       'action.retry': 'Retry',
       'action.openExternal': 'Open in new tab',
+      'action.expandSidebar': 'Expand sidebar',
       'error.proxyTitle': 'Embedded mode is unavailable',
       'error.proxyBody': 'The local ERP proxy did not start, so the system cannot be embedded here. You can still open the original site in a new tab.',
       'error.httpsTitle': 'Embedded mode needs the local http address',
@@ -63,6 +69,7 @@ window.__ModuleLoader__.load({
       'status.loading': '正在连接…',
       'action.retry': '重试',
       'action.openExternal': '在新窗口打开',
+      'action.expandSidebar': '展开侧边栏',
       'error.proxyTitle': '内嵌模式不可用',
       'error.proxyBody': '本地 ERP 代理未启动，无法在此页面内嵌；你仍然可以在新窗口打开原站。',
       'error.httpsTitle': '内嵌模式需要本地 http 地址',
@@ -95,6 +102,7 @@ window.__ModuleLoader__.load({
         'M6.5 12.5v3M10 12.5v2M13.5 12.5v3M17 12.5v2',
       ],
       alert: ['M12 3.2 2.9 19.8h18.2L12 3.2Z', 'M12 9.4v4.4', 'M12 16.6v.2'],
+      panelLeft: ['M3.5 5.5h17a1 1 0 0 1 1 1v11a1 1 0 0 1-1 1h-17a1 1 0 0 1-1-1v-11a1 1 0 0 1 1-1Z', 'M9 5.5v13'],
     }
 
     function Icon({ name, size = 16 }) {
@@ -199,11 +207,12 @@ window.__ModuleLoader__.load({
     // Persistent ERP surface
     // ---------------------------------------------------------------
 
-    function ErpSurface({ t, localeFace, store, usePanelInfo }) {
+    function ErpSurface({ t, localeFace, store, usePanelInfo, layout }) {
       const active = usePanelInfo((info) => info.activePanelId === PANEL_KEY)
       const rect = useSyncExternalStore(store.subscribe, store.getRect, store.getRect)
       useSyncExternalStore(localeFace.subscribe, localeFace.getSnapshot, localeFace.getSnapshot)
 
+      const lang = activeLang(localeFace)
       const [started, setStarted] = useState(false)
       const [attempt, setAttempt] = useState(0)
       const [proxy, setProxy] = useState({ phase: 'loading', port: 0, target: DEFAULT_TARGET })
@@ -294,9 +303,10 @@ window.__ModuleLoader__.load({
       const ready = proxy.phase === 'ready'
       // A stale browser token must not outlive the server-side session: the
       // reset page clears the proxy origin's storage and forwards to /login.
-      const targetPath = judged && !loggedIn ? '/_ponlay/reset' : '/'
+      const targetPath = judged && !loggedIn ? `/_ponlay/reset?ponlay_lang=${lang}` : '/'
       const src = ready && judged ? `http://${PROXY_HOST}:${proxy.port}${targetPath}` : ''
       const visible = active && Boolean(rect) && rect.width > 0 && rect.height > 0
+      const collapsed = Boolean(rect) && rect.left < 120
       const style = {
         top: `${rect ? rect.top : 0}px`,
         left: `${rect ? rect.left : 0}px`,
@@ -344,17 +354,30 @@ window.__ModuleLoader__.load({
         'div',
         { className: 'erp-surface', style, 'data-hidden': visible ? 'false' : 'true' },
         face,
+        visible && collapsed
+          ? h(
+              'button',
+              {
+                type: 'button',
+                className: 'erp-expand',
+                title: t('action.expandSidebar'),
+                'aria-label': t('action.expandSidebar'),
+                onClick: () => layout?.toggleSidebar(),
+              },
+              h(Icon, { name: 'panelLeft', size: 16 }),
+            )
+          : null,
         showLoading
           ? h('div', { className: 'erp-loading', 'aria-hidden': true }, h('span', { className: 'erp-spinner' }), t('status.loading'))
           : null,
       )
     }
 
-    function ErpSurfaceHost({ t, localeFace, store, usePanelInfo }) {
+    function ErpSurfaceHost({ t, localeFace, store, usePanelInfo, layout }) {
       // A slot entry that throws blanks its registration; degrade to "off"
       // instead if the standard kit ever stops providing the panel hook.
       if (typeof usePanelInfo !== 'function') return null
-      return h(ErpSurface, { t, localeFace, store, usePanelInfo })
+      return h(ErpSurface, { t, localeFace, store, usePanelInfo, layout })
     }
 
     // ---------------------------------------------------------------
@@ -560,6 +583,9 @@ window.__ModuleLoader__.load({
 .erp-cfg-notice-pending{border-color:color-mix(in srgb,var(--dsw-alias-state-warn-primary) 45%,transparent);color:var(--dsw-alias-state-warn-primary)}
 .erp-cfg-notice-error{border-color:color-mix(in srgb,var(--dsw-alias-state-error-primary) 45%,transparent);color:var(--dsw-alias-state-error-primary)}
 .erp-cfg-summary{font-size:12px;line-height:1.6;color:var(--dsw-alias-label-secondary);overflow-wrap:anywhere}
+.erp-expand{position:absolute;top:calc(var(--dsh-frame-top-clearance,0px) + 10px);left:12px;z-index:5;display:flex;align-items:center;justify-content:center;width:32px;height:32px;padding:0;border:1px solid var(--dsw-alias-border-l1);border-radius:9px;background:var(--dsw-alias-bg-overlay);color:var(--dsw-alias-label-secondary);box-shadow:0 6px 18px color-mix(in srgb,var(--dsw-alias-label-primary) 16%,transparent);cursor:pointer;-webkit-backdrop-filter:blur(8px);backdrop-filter:blur(8px)}
+.erp-expand:hover{background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary)}
+.erp-expand:focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:2px}
 @keyframes erp-spin{to{transform:rotate(360deg)}}
 @media (prefers-reduced-motion:reduce){.erp-spinner{animation-duration:1.6s}}
 `
@@ -573,6 +599,7 @@ window.__ModuleLoader__.load({
       inject: ['slots', 'locale'],
       apply(ctx) {
         const locale = ctx.get('locale')
+        const layout = ctx.get('layout')
         const store = createRectStore()
         const dicts = [locale.register('ponlay-erp', 'en', EN), locale.register('ponlay-erp', 'zh', ZH)]
         ctx.effect(() => () => {
@@ -607,6 +634,7 @@ window.__ModuleLoader__.load({
                 t,
                 localeFace,
                 store,
+                layout,
                 usePanelInfo: props.usePanelInfo,
               }),
           ),

package/index.js

@@ -24,12 +24,20 @@ const INFO_PATH = '/plugin/ponlay-erp/info'
 const STATE_PATH = '/plugin/ponlay-erp/state'
 const CONFIG_PATH = '/plugin/ponlay-erp/config'
 const RESET_PATH = '/_ponlay/reset'
-const RESET_HTML = `<!doctype html>
-<html lang="zh"><head><meta charset="utf-8"><title>Ponlay ERP</title></head>
+/** Reset page: clear the stale ERP session but seed the UI language. */
+function resetHtml(lang) {
+  const locale = lang === 'en' ? 'en' : 'zh'
+  return `<!doctype html>
+<html lang="${locale}"><head><meta charset="utf-8"><title>Ponlay ERP</title></head>
 <body><script>
-try { localStorage.clear(); sessionStorage.clear(); } catch (error) {}
+try {
+  localStorage.clear();
+  sessionStorage.clear();
+  localStorage.setItem('GlobalState', JSON.stringify({ language: '${locale}' }));
+} catch (error) {}
 location.replace('/login');
 </script></body></html>`
+}
 const PORT_CANDIDATES = [4317, 4318, 4319, 4320, 4321, 4322, 4323, 4324, 4325, 4326]
 const MAX_UPSTREAM_BYTES = 8 * 1024 * 1024
 const MAX_CONFIG_BODY_BYTES = 64 * 1024
@@ -248,13 +256,15 @@ function createProxyHandler(jar, port, target) {
 
     // A stale browser token must not outlive the server-side session: clear the
     // proxy origin's storage, then let the ERP show its own login page.
-    if (req.url === RESET_PATH) {
+    const requestUrl = new URL(req.url || '/', 'http://127.0.0.1')
+    if (requestUrl.pathname === RESET_PATH) {
+      const html = resetHtml(requestUrl.searchParams.get('ponlay_lang') === 'en' ? 'en' : 'zh')
       res.writeHead(200, {
         'content-type': 'text/html; charset=utf-8',
         'cache-control': 'no-store',
-        'content-length': Buffer.byteLength(RESET_HTML),
+        'content-length': Buffer.byteLength(html),
       })
-      res.end(req.method === 'HEAD' ? undefined : RESET_HTML)
+      res.end(req.method === 'HEAD' ? undefined : html)
       return
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ponlay-erp",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Ponlay ERP system embedded in DeepSeek Harness: the ERP login page or signed-in layout fills the main area, with a configurable system address.",
   "type": "module",
   "license": "MIT",