hy-dispatch-ui-v3 0.2.2 → 0.2.3

package/lib/static/index.js

@@ -1,5 +1,2 @@
-'use strict';
-
-require('./hy-svg-icons.js');
-require('./protocolcheck.js');
-
+import './hy-svg-icons.js'
+import './protocolcheck.js'

package/lib/static/protocolcheck.js

@@ -1,39 +1,38 @@
-'use strict';
-
-(function (f) {
+;(function (f) {
   if (typeof exports === 'object' && typeof module !== 'undefined') {
-    module.exports = f();
+    module.exports = f()
   } else if (typeof define === 'function' && define.amd) {
-    define([], f);
+    define([], f)
   } else {
-    var g;
+    var g
     if (typeof window !== 'undefined') {
-      g = window;
+      g = window
     } else if (typeof global !== 'undefined') {
-      g = global;
+      g = global
     } else if (typeof self !== 'undefined') {
-      g = self;
+      g = self
     } else {
-      g = this;
+      g = this
     }
-    g.protocolCheck = f();
+    g.protocolCheck = f()
   }
 })(function () {
+  var define, module, exports
   return (function e(t, n, r) {
     function s(o, u) {
       if (!n[o]) {
         if (!t[o]) {
-          var a = typeof require == 'function' && require;
-          if (!u && a) return a(o, true)
-          if (i) return i(o, true)
-          var f = new Error("Cannot find module '" + o + "'");
+          var a = typeof require == 'function' && require
+          if (!u && a) return a(o, !0)
+          if (i) return i(o, !0)
+          var f = new Error("Cannot find module '" + o + "'")
           throw ((f.code = 'MODULE_NOT_FOUND'), f)
         }
-        var l = (n[o] = { exports: {} });
+        var l = (n[o] = { exports: {} })
         t[o][0].call(
           l.exports,
           function (e) {
-            var n = t[o][1][e];
+            var n = t[o][1][e]
             return s(n ? n : e)
           },
           l,
@@ -42,141 +41,164 @@
           t,
           n,
           r
-        );
+        )
       }
       return n[o].exports
     }
-    var i = typeof require == 'function' && require;
-    for (var o = 0; o < r.length; o++) s(r[o]);
+    var i = typeof require == 'function' && require
+    for (var o = 0; o < r.length; o++) s(r[o])
     return s
   })(
     {
       1: [
-        function (require, module, exports$1) {
+        function (require, module, exports) {
           function _registerEvent(target, eventType, cb) {
             if (target.addEventListener) {
-              target.addEventListener(eventType, cb);
+              target.addEventListener(eventType, cb)
               return {
                 remove: function () {
-                  target.removeEventListener(eventType, cb);
+                  target.removeEventListener(eventType, cb)
                 },
               }
             } else {
-              target.attachEvent(eventType, cb);
+              target.attachEvent(eventType, cb)
               return {
                 remove: function () {
-                  target.detachEvent(eventType, cb);
+                  target.detachEvent(eventType, cb)
                 },
               }
             }
           }
 
           function _createHiddenIframe(target, uri) {
-            var iframe = document.createElement('iframe');
-            iframe.src = uri;
-            iframe.id = 'hiddenIframe';
-            iframe.style.display = 'none';
-            target.appendChild(iframe);
+            var iframe = document.createElement('iframe')
+            iframe.src = uri
+            iframe.id = 'hiddenIframe'
+            iframe.style.display = 'none'
+            target.appendChild(iframe)
 
             return iframe
           }
 
           function openUriWithHiddenFrame(uri, failCb, successCb) {
             var timeout = setTimeout(function () {
-              failCb();
-              handler.remove();
-            }, 1000);
+              failCb()
+              handler.remove()
+            }, 1000)
 
-            var iframe = document.querySelector('#hiddenIframe');
+            var iframe = document.querySelector('#hiddenIframe')
             if (!iframe) {
-              iframe = _createHiddenIframe(document.body, 'about:blank');
+              iframe = _createHiddenIframe(document.body, 'about:blank')
+            }
+
+            var handler = _registerEvent(window, 'blur', onBlur)
+
+            function onBlur() {
+              clearTimeout(timeout)
+              handler.remove()
+              successCb()
+            }
+
+            iframe.contentWindow.location.href = uri
+          }
+
+          function openUriWithTimeoutHack(uri, failCb, successCb) {
+            var timeout = setTimeout(function () {
+              failCb()
+              handler.remove()
+            }, 1000)
+
+            //handle page running in an iframe (blur must be registered with top level window)
+            var target = window
+            while (target != target.parent) {
+              target = target.parent
             }
 
-            var handler = _registerEvent(window, 'blur', onBlur);
+            var handler = _registerEvent(target, 'blur', onBlur)
 
             function onBlur() {
-              clearTimeout(timeout);
-              handler.remove();
-              successCb();
+              clearTimeout(timeout)
+              handler.remove()
+              successCb()
             }
 
-            iframe.contentWindow.location.href = uri;
+            window.location = uri
           }
 
           function openUriUsingFirefox(uri, failCb, successCb) {
-            var iframe = document.querySelector('#hiddenIframe');
+            var iframe = document.querySelector('#hiddenIframe')
 
             if (!iframe) {
-              iframe = _createHiddenIframe(document.body, 'about:blank');
+              iframe = _createHiddenIframe(document.body, 'about:blank')
             }
 
             try {
-              iframe.contentWindow.location.href = uri;
-              successCb();
+              iframe.contentWindow.location.href = uri
+              successCb()
             } catch (e) {
               if (e.name == 'NS_ERROR_UNKNOWN_PROTOCOL') {
-                failCb();
+                failCb()
               }
             }
           }
 
           function openUriUsingIEInOlderWindows(uri, failCb, successCb) {
             if (getInternetExplorerVersion() === 10) {
-              openUriUsingIE10InWindows7(uri, failCb, successCb);
+              openUriUsingIE10InWindows7(uri, failCb, successCb)
             } else if (
               getInternetExplorerVersion() === 9 ||
               getInternetExplorerVersion() === 11
             ) {
-              openUriWithHiddenFrame(uri, failCb, successCb);
+              openUriWithHiddenFrame(uri, failCb, successCb)
             } else {
-              openUriInNewWindowHack(uri, failCb, successCb);
+              openUriInNewWindowHack(uri, failCb, successCb)
             }
           }
 
           function openUriUsingIE10InWindows7(uri, failCb, successCb) {
-            var timeout = setTimeout(failCb, 1000);
+            var timeout = setTimeout(failCb, 1000)
             window.addEventListener('blur', function () {
-              clearTimeout(timeout);
-              successCb();
-            });
+              clearTimeout(timeout)
+              successCb()
+            })
 
-            var iframe = document.querySelector('#hiddenIframe');
+            var iframe = document.querySelector('#hiddenIframe')
             if (!iframe) {
-              iframe = _createHiddenIframe(document.body, 'about:blank');
+              iframe = _createHiddenIframe(document.body, 'about:blank')
             }
             try {
-              iframe.contentWindow.location.href = uri;
+              iframe.contentWindow.location.href = uri
             } catch (e) {
-              failCb();
-              clearTimeout(timeout);
+              failCb()
+              clearTimeout(timeout)
             }
           }
 
           function openUriInNewWindowHack(uri, failCb, successCb) {
-            var myWindow = window.open('', '', 'width=0,height=0');
+            var myWindow = window.open('', '', 'width=0,height=0')
 
-            myWindow.document.write("<iframe src='" + uri + "'></iframe>");
+            myWindow.document.write("<iframe src='" + uri + "'></iframe>")
 
             setTimeout(function () {
               try {
-                myWindow.location.href;
-                myWindow.setTimeout('window.close()', 1000);
-                successCb();
+                myWindow.location.href
+                myWindow.setTimeout('window.close()', 1000)
+                successCb()
               } catch (e) {
-                myWindow.close();
-                failCb();
+                myWindow.close()
+                failCb()
               }
-            }, 1000);
+            }, 1000)
           }
 
           function openUriWithMsLaunchUri(uri, failCb, successCb) {
-            navigator.msLaunchUri(uri, successCb, failCb);
+            navigator.msLaunchUri(uri, successCb, failCb)
           }
 
           function checkBrowser() {
             var isOpera =
-              !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
-            var ua = navigator.userAgent.toLowerCase();
+              !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0
+            var ua = navigator.userAgent.toLowerCase()
             return {
               isOpera: isOpera,
               isFirefox: typeof InstallTrigger !== 'undefined',
@@ -189,21 +211,21 @@
                 /iPad|iPhone|iPod/.test(navigator.userAgent) &&
                 !window.MSStream,
               isChrome: !!window.chrome && !isOpera,
-              isIE: /*@cc_on!@*/ !!document.documentMode, // At least IE6
+              isIE: /*@cc_on!@*/ false || !!document.documentMode, // At least IE6
             }
           }
 
           function getInternetExplorerVersion() {
-            var rv = -1;
+            var rv = -1
             if (navigator.appName === 'Microsoft Internet Explorer') {
-              var ua = navigator.userAgent;
-              var re = new RegExp('MSIE ([0-9]{1,}[\.0-9]{0,})');
-              if (re.exec(ua) != null) rv = parseFloat(RegExp.$1);
+              var ua = navigator.userAgent
+              var re = new RegExp('MSIE ([0-9]{1,}[\.0-9]{0,})')
+              if (re.exec(ua) != null) rv = parseFloat(RegExp.$1)
             } else if (navigator.appName === 'Netscape') {
-              var ua = navigator.userAgent;
-              var re = new RegExp('Trident/.*rv:([0-9]{1,}[\.0-9]{0,})');
+              var ua = navigator.userAgent
+              var re = new RegExp('Trident/.*rv:([0-9]{1,}[\.0-9]{0,})')
               if (re.exec(ua) != null) {
-                rv = parseFloat(RegExp.$1);
+                rv = parseFloat(RegExp.$1)
               }
             }
             return rv
@@ -211,34 +233,34 @@
 
           module.exports = function (uri, failCb, successCb, unsupportedCb) {
             function failCallback() {
-              failCb && failCb();
+              failCb && failCb()
             }
 
             function successCallback() {
-              successCb && successCb();
+              successCb && successCb()
             }
 
             if (navigator.msLaunchUri) {
               //for IE and Edge in Win 8 and Win 10
-              openUriWithMsLaunchUri(uri, failCb, successCb);
+              openUriWithMsLaunchUri(uri, failCb, successCb)
             } else {
-              var browser = checkBrowser();
+              var browser = checkBrowser()
 
               if (browser.isFirefox) {
-                openUriUsingFirefox(uri, failCallback, successCallback);
+                openUriUsingFirefox(uri, failCallback, successCallback)
               } else if (browser.isChrome || browser.isIOS) {
                 // openUriWithTimeoutHack(uri, failCallback, successCallback);
-                openUriWithHiddenFrame(uri, failCallback, successCallback);
+                openUriWithHiddenFrame(uri, failCallback, successCallback)
               } else if (browser.isIE) {
-                openUriUsingIEInOlderWindows(uri, failCallback, successCallback);
+                openUriUsingIEInOlderWindows(uri, failCallback, successCallback)
               } else if (browser.isSafari) {
-                openUriWithHiddenFrame(uri, failCallback, successCallback);
+                openUriWithHiddenFrame(uri, failCallback, successCallback)
               } else {
-                unsupportedCb();
+                unsupportedCb()
                 //not supported, implement please
               }
             }
-          };
+          }
         },
         {},
       ],
@@ -246,4 +268,4 @@
     {},
     [1]
   )(1)
-});
+})

package/lib/static/vite-plugin-hy-svg-icons.js

@@ -0,0 +1,240 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+const STATIC_VIRTUAL_ID = 'virtual:hy-svg-icons';
+const REGISTRY_VIRTUAL_ID = 'virtual:hy-svg-icons/registry';
+const STATIC_RESOLVED_ID = '\0' + STATIC_VIRTUAL_ID;
+const REGISTRY_RESOLVED_ID = '\0' + REGISTRY_VIRTUAL_ID;
+
+/**
+ * 扫描源码里出现的 svg-name 字面量，结合 hy-svg-icons/ 目录下每个图标文件的
+ * 顶层 id（形如 'hy-icon-<svg-name>'）做白名单匹配，生成两个虚拟模块：
+ *
+ *   virtual:hy-svg-icons          — 静态注入：把用到的图标 import + registerSymbol 一次注册进 sprite。
+ *   virtual:hy-svg-icons/registry — 完整注册表：{ svgName: () => import(iconFile) }，用于 AppIcon 动态兜底。
+ *
+ * 数据源：每个图标一个文件，形如 src/assets/hy-svg-icons/<name>.js
+ *   export default {
+ *     id: 'hy-icon-<svg-name>',
+ *     defs?: `...`,
+ *     symbol: `...`,
+ *   }
+ *
+ * 只有 hy-icon- 前缀是固定的（由 AppIcon 拼接），svg-name 内部结构不做假设。
+ */
+export function hySvgIconsPlugin(options = {}) {
+  const {
+    dataDir = 'src/assets/hy-svg-icons',
+    spriteFile = 'src/assets/hy-svg-icons/_sprite.js',
+    scanDirs = ['src'],
+    exts = ['vue', 'js', 'ts', 'jsx', 'tsx'],
+    idPrefix = 'hy-icon-',
+  } = options;
+
+  let projectRoot = process.cwd();
+  let dataDirAbs = '';
+  /** svg-name (id 去 hy-icon- 前缀) -> 数据文件绝对路径 */
+  let available = new Map();
+  /** 数据文件绝对路径集合，用于源码扫描时跳过自己 */
+  let dataFilesAbs = new Set();
+  let used = new Set();
+  let server = null;
+
+  const extSet = new Set(exts.map((e) => '.' + e));
+  const escapedIdPrefix = idPrefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+  // 数据文件里的顶层 id：行首缩进 + `id:` + 引号 + hy-icon-XXX + 引号
+  // multiline 模式，只匹配"作为对象键"的 id，绕过 SVG 内嵌 id="..." 的干扰
+  function makeIdRe() {
+    return new RegExp(`^\\s*id:\\s*['"]${escapedIdPrefix}([A-Za-z0-9_-]+)['"]`, 'm');
+  }
+
+  // 源码里 svg-name 候选：kebab-case 至少两段（首字符字母）
+  function makeNameRe() {
+    return /[a-zA-Z][a-zA-Z0-9]*(?:-[a-zA-Z0-9]+)+/g;
+  }
+
+  async function collectDataFiles() {
+    let entries;
+    try {
+      entries = await fs.readdir(dataDirAbs, { withFileTypes: true });
+    } catch {
+      return [];
+    }
+    const out = [];
+    for (const entry of entries) {
+      if (!entry.isFile()) continue;
+      if (!entry.name.endsWith('.js')) continue;
+      // 以 _ 开头的当内部文件（如 _sprite.js）
+      if (entry.name.startsWith('_')) continue;
+      // index.js 保留给未来 re-export，不算图标数据
+      if (entry.name === 'index.js') continue;
+      out.push(path.join(dataDirAbs, entry.name));
+    }
+    return out;
+  }
+
+  async function loadAvailable() {
+    const files = await collectDataFiles();
+    dataFilesAbs = new Set(files);
+    const map = new Map();
+    await Promise.all(
+      files.map(async (file) => {
+        try {
+          const content = await fs.readFile(file, 'utf-8');
+          const idRe = makeIdRe();
+          const m = idRe.exec(content);
+          if (m) map.set(m[1], file);
+        } catch {}
+      }),
+    );
+    available = map;
+  }
+
+  async function walk(dir, out) {
+    let entries;
+    try {
+      entries = await fs.readdir(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (entry.name === 'node_modules' || entry.name.startsWith('.')) continue;
+      const full = path.join(dir, entry.name);
+      // 数据源自身不算"使用"
+      if (dataFilesAbs.has(full)) continue;
+      if (entry.isDirectory()) {
+        await walk(full, out);
+      } else if (extSet.has(path.extname(entry.name))) {
+        out.push(full);
+      }
+    }
+  }
+
+  async function scanUsage() {
+    const files = [];
+    for (const d of scanDirs) {
+      await walk(path.resolve(projectRoot, d), files);
+    }
+    const found = new Set();
+    await Promise.all(
+      files.map(async (file) => {
+        let content;
+        try {
+          content = await fs.readFile(file, 'utf-8');
+        } catch {
+          return;
+        }
+        const nameRe = makeNameRe();
+        let m;
+        while ((m = nameRe.exec(content))) {
+          if (available.has(m[0])) found.add(m[0]);
+        }
+      }),
+    );
+    return found;
+  }
+
+  function toImportPath(absPath) {
+    const rel = path.relative(projectRoot, absPath).replace(/\\/g, '/');
+    // 一律走 project-root 相对绝对路径（形如 /src/... 或 /node_modules/...）。
+    // Vite 把 / 开头的路径当作文件来服务，绕过包 exports 校验；
+    // 而裸导入 pkg/sub-path 会强制走 exports 白名单，很多包只暴露聚合入口，个文件用不了。
+    return '/' + rel;
+  }
+
+  function toIdent(svgName) {
+    return '__hy_' + svgName.replace(/[^a-zA-Z0-9]/g, '_');
+  }
+
+  function buildStaticModule() {
+    const names = [...used].filter((n) => available.has(n)).sort();
+    if (names.length === 0) return '// no hy-svg-icons used\n';
+    const spritePath = toImportPath(path.resolve(projectRoot, spriteFile));
+    const lines = [`import { registerSymbol } from '${spritePath}';`];
+    for (const name of names) {
+      lines.push(`import ${toIdent(name)} from '${toImportPath(available.get(name))}';`);
+    }
+    for (const name of names) {
+      lines.push(`registerSymbol(${toIdent(name)});`);
+    }
+    lines.push('');
+    return lines.join('\n');
+  }
+
+  function buildRegistryModule() {
+    const names = [...available.keys()].sort();
+    if (names.length === 0) return 'export const registry = {};\n';
+    const lines = ['export const registry = {'];
+    for (const name of names) {
+      lines.push(`  '${name}': () => import('${toImportPath(available.get(name))}'),`);
+    }
+    lines.push('};', '');
+    return lines.join('\n');
+  }
+
+  async function refresh() {
+    await loadAvailable();
+    const next = await scanUsage();
+    const same =
+      next.size === used.size && [...next].every((x) => used.has(x));
+    used = next;
+    return !same;
+  }
+
+  return {
+    name: 'vite-plugin-hy-svg-icons',
+    enforce: 'pre',
+
+    configResolved(config) {
+      projectRoot = config.root || process.cwd();
+      dataDirAbs = path.resolve(projectRoot, dataDir);
+    },
+
+    async buildStart() {
+      await refresh();
+    },
+
+    resolveId(id) {
+      if (id === STATIC_VIRTUAL_ID) return STATIC_RESOLVED_ID;
+      if (id === REGISTRY_VIRTUAL_ID) return REGISTRY_RESOLVED_ID;
+      return null;
+    },
+
+    load(id) {
+      if (id === STATIC_RESOLVED_ID) return buildStaticModule();
+      if (id === REGISTRY_RESOLVED_ID) return buildRegistryModule();
+      return null;
+    },
+
+    configureServer(s) {
+      server = s;
+    },
+
+    async handleHotUpdate(ctx) {
+      const ext = path.extname(ctx.file);
+      const inDataDir = ctx.file.startsWith(dataDirAbs + path.sep);
+      if (!extSet.has(ext) && !inDataDir) return;
+
+      const changed = await refresh();
+      if (!changed || !server) return;
+
+      const staticMod = server.moduleGraph.getModuleById(STATIC_RESOLVED_ID);
+      const registryMod = server.moduleGraph.getModuleById(REGISTRY_RESOLVED_ID);
+      let invalidated = false;
+      if (staticMod) {
+        server.moduleGraph.invalidateModule(staticMod);
+        invalidated = true;
+      }
+      if (registryMod) {
+        server.moduleGraph.invalidateModule(registryMod);
+        invalidated = true;
+      }
+      if (invalidated) {
+        server.ws.send({ type: 'full-reload' });
+      }
+    },
+  };
+}
+
+export default hySvgIconsPlugin;

package/lib/utils/date.js

@@ -23,6 +23,7 @@ function getDefaultValueFormatByType(type = "date") {
     default:
       return "YYYY-MM-DD";
   }
+  return null;
 }
 function formatDuration(duration, isSecond = false) {
   if (!duration || !is.isNumber(duration)) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "scripts": {
@@ -124,8 +124,8 @@
       "require": "./lib/static/index.js"
     },
     "./static/*": {
-      "import": "./es/static/*.js",
-      "require": "./lib/static/*.js"
+      "import": "./es/static/*",
+      "require": "./lib/static/*"
     },
     "./tailwind.css": "./dist/tailwind.css"
   },