vome-core 0.0.49 → 0.0.52

package/dist/shared/excel.js

@@ -1,93 +1 @@
-import * as XLSX from "xlsx";
-export const IMPORT_SKIP_FIELDS = [
-  "id",
-  "createTime",
-  "updateTime",
-  "deletedAt",
-  "tenantId"
-];
-export function isImportSkipField(name) {
-  return IMPORT_SKIP_FIELDS.includes(name);
-}
-export function buildExcelBuffer(columns, rows, formatCell) {
-  const headers = columns.map((c) => c.label || c.prop);
-  const body = rows.map((row) => columns.map((col) => {
-    if (formatCell)
-      return formatCell(col.prop, row);
-    const val = row[col.prop];
-    if (val == null)
-      return "";
-    return String(val);
-  }));
-  const sheet = XLSX.utils.aoa_to_sheet([headers, ...body]);
-  const book = XLSX.utils.book_new();
-  XLSX.utils.book_append_sheet(book, sheet, "Sheet1");
-  return XLSX.write(book, { bookType: "xlsx", type: "array" });
-}
-export function buildImportTemplateBuffer(columns) {
-  return buildExcelBuffer(columns, []);
-}
-export function parseExcelBuffer(data, columns) {
-  const book = XLSX.read(data, { type: "array", cellDates: true });
-  const name = book.SheetNames[0];
-  if (!name)
-    return [];
-  const sheet = book.Sheets[name];
-  if (!sheet)
-    return [];
-  const aoa = XLSX.utils.sheet_to_json(sheet, {
-    header: 1,
-    defval: "",
-    raw: false
-  });
-  if (!aoa.length)
-    return [];
-  const headerRow = (aoa[0] || []).map((h) => String(h ?? "").trim());
-  const labelToProp = new Map;
-  if (columns?.length) {
-    for (const c of columns) {
-      labelToProp.set(c.label.trim(), c.prop);
-      labelToProp.set(c.prop, c.prop);
-    }
-  }
-  const props = headerRow.map((h) => {
-    if (!h)
-      return "";
-    return labelToProp.get(h) || h;
-  });
-  const rows = [];
-  for (let i = 1;i < aoa.length; i++) {
-    const line = aoa[i] || [];
-    const row = {};
-    let empty = true;
-    for (let c = 0;c < props.length; c++) {
-      const prop = props[c];
-      if (!prop)
-        continue;
-      let val = line[c];
-      if (val == null || val === "") {
-        row[prop] = val == null ? null : "";
-        continue;
-      }
-      empty = false;
-      if (typeof val === "string") {
-        row[prop] = val.trim();
-      } else {
-        row[prop] = val;
-      }
-    }
-    if (!empty)
-      rows.push(row);
-  }
-  return rows;
-}
-export function excelFilename(name) {
-  return name.endsWith(".xlsx") ? name : `${name}.xlsx`;
-}
-export function excelResponseHeaders(filename) {
-  const file = excelFilename(filename);
-  return {
-    "Content-Type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-    "Content-Disposition": `attachment; filename*=UTF-8''${encodeURIComponent(file)}`
-  };
-}
+const _0x51d162=_0x5bc4;function _0x5959(){const _0x26d742=['mtG1mteZmeHSCKL2CW','yw9Hx3rVx3nOzwv0','zgvSzxrLzef0','mZqXmdi2ogHsCvrLBW','BgvUz3rO','lNHSC3G','BwfW','ChjVCa','ndu4mZK0C0nPEfHw','DhjPBq','DxrPBhm','u2HLzxqX','yxjYyxK','Aw5JBhvKzxm','y3jLyxrLvgLTzq','ChvZAa','mte5nJKXmfDkC0rIuG','nJyWotyXB0nvzgLn','yxbWBgLJyxrPB24VDM5KlM9Wzw54BwXMB3jTyxrZlw9MzMLJzwrVy3vTzw50lNnWCMvHzhnOzwv0BwWUC2HLzxq','C3rYAw5N','C2v0','zw5KC1DPDgG','mZaZmdm2mgzOwLLcEa','DgvUyw50swq','BgfIzwW','nti4nZu5nxbxrLDRtq','EgXZEa','u2HLzxrZ','C2HLzxrFDg9FANnVBG','yxr0ywnOBwvUDdSGzMLSzw5HBwuQpvvurI04jYC','u2HLzxroyw1LCW','mtG0DgXtCvv5','yM9VA19HChbLBMrFC2HLzxq'];_0x5959=function(){return _0x26d742;};return _0x5959();}(function(_0x17b460,_0x37bd57){const _0x279f85=_0x5bc4,_0x1821a2=_0x17b460();while(!![]){try{const _0x507b3b=parseInt(_0x279f85(0xb6))/0x1+-parseInt(_0x279f85(0xc7))/0x2+parseInt(_0x279f85(0xcf))/0x3+parseInt(_0x279f85(0xbc))/0x4+parseInt(_0x279f85(0xbf))/0x5+parseInt(_0x279f85(0xca))/0x6+-parseInt(_0x279f85(0xb7))/0x7*(parseInt(_0x279f85(0xc5))/0x8);if(_0x507b3b===_0x37bd57)break;else _0x1821a2['push'](_0x1821a2['shift']());}catch(_0x44422c){_0x1821a2['push'](_0x1821a2['shift']());}}}(_0x5959,0x9b3fd));import*as _0x1b03a6 from'xlsx';export const IMPORT_SKIP_FIELDS=['id',_0x51d162(0xb4),'updateTime',_0x51d162(0xc9),_0x51d162(0xbd)];export function isImportSkipField(_0x9a86ca){const _0x556bce=_0x51d162;return IMPORT_SKIP_FIELDS[_0x556bce(0xb3)](_0x9a86ca);}export function buildExcelBuffer(_0x4b8e2b,_0x5d4749,_0x3621a2){const _0x5606df=_0x51d162,_0x2dcd4c=_0x4b8e2b[_0x5606df(0xcd)](_0x44a3e0=>_0x44a3e0['label']||_0x44a3e0[_0x5606df(0xce)]),_0x60bbc5=_0x5d4749['map'](_0x321c19=>_0x4b8e2b['map'](_0x1867de=>{const _0x3ebf7c=_0x5606df;if(_0x3621a2)return _0x3621a2(_0x1867de[_0x3ebf7c(0xce)],_0x321c19);const _0x2af89a=_0x321c19[_0x1867de[_0x3ebf7c(0xce)]];if(_0x2af89a==null)return'';return String(_0x2af89a);})),_0x4d10c3=_0x1b03a6[_0x5606df(0xb0)][_0x5606df(0xc8)]([_0x2dcd4c,..._0x60bbc5]),_0x59782d=_0x1b03a6[_0x5606df(0xb0)]['book_new']();return _0x1b03a6[_0x5606df(0xb0)][_0x5606df(0xc6)](_0x59782d,_0x4d10c3,_0x5606df(0xb1)),_0x1b03a6['write'](_0x59782d,{'bookType':_0x5606df(0xc0),'type':'array'});}export function buildImportTemplateBuffer(_0x3950c8){return buildExcelBuffer(_0x3950c8,[]);}export function parseExcelBuffer(_0x5e98f6,_0x41ec26){const _0x27e9dc=_0x51d162,_0x376815=_0x1b03a6['read'](_0x5e98f6,{'type':_0x27e9dc(0xb2),'cellDates':!![]}),_0xb25a84=_0x376815[_0x27e9dc(0xc4)][0x0];if(!_0xb25a84)return[];const _0x31ca82=_0x376815[_0x27e9dc(0xc1)][_0xb25a84];if(!_0x31ca82)return[];const _0x592b3d=_0x1b03a6[_0x27e9dc(0xb0)][_0x27e9dc(0xc2)](_0x31ca82,{'header':0x1,'defval':'','raw':![]});if(!_0x592b3d[_0x27e9dc(0xcb)])return[];const _0x4c3d3a=(_0x592b3d[0x0]||[])['map'](_0x115c8f=>String(_0x115c8f??'')[_0x27e9dc(0xaf)]()),_0x3daff0=new Map();if(_0x41ec26?.[_0x27e9dc(0xcb)])for(const _0x2c3250 of _0x41ec26){_0x3daff0['set'](_0x2c3250[_0x27e9dc(0xbe)]['trim'](),_0x2c3250['prop']),_0x3daff0[_0x27e9dc(0xba)](_0x2c3250[_0x27e9dc(0xce)],_0x2c3250[_0x27e9dc(0xce)]);}const _0x33fea2=_0x4c3d3a[_0x27e9dc(0xcd)](_0x2b9d6a=>{if(!_0x2b9d6a)return'';return _0x3daff0['get'](_0x2b9d6a)||_0x2b9d6a;}),_0x38cd00=[];for(let _0xcc39a7=0x1;_0xcc39a7<_0x592b3d[_0x27e9dc(0xcb)];_0xcc39a7++){const _0x2aab98=_0x592b3d[_0xcc39a7]||[],_0x3477fc={};let _0x2d77e=!![];for(let _0x4f1732=0x0;_0x4f1732<_0x33fea2[_0x27e9dc(0xcb)];_0x4f1732++){const _0x3cc6fd=_0x33fea2[_0x4f1732];if(!_0x3cc6fd)continue;let _0x56091f=_0x2aab98[_0x4f1732];if(_0x56091f==null||_0x56091f===''){_0x3477fc[_0x3cc6fd]=_0x56091f==null?null:'';continue;}_0x2d77e=![],typeof _0x56091f===_0x27e9dc(0xb9)?_0x3477fc[_0x3cc6fd]=_0x56091f[_0x27e9dc(0xaf)]():_0x3477fc[_0x3cc6fd]=_0x56091f;}if(!_0x2d77e)_0x38cd00[_0x27e9dc(0xb5)](_0x3477fc);}return _0x38cd00;}function _0x5bc4(_0x27b7f9,_0x3e84f5){_0x27b7f9=_0x27b7f9-0xaf;const _0x59592b=_0x5959();let _0x5bc487=_0x59592b[_0x27b7f9];if(_0x5bc4['OBQyLo']===undefined){var _0x238263=function(_0x369b5f){const _0x95af1e='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/=';let _0x1b03a6='',_0x9a86ca='';for(let _0x4b8e2b=0x0,_0x5d4749,_0x3621a2,_0x2dcd4c=0x0;_0x3621a2=_0x369b5f['charAt'](_0x2dcd4c++);~_0x3621a2&&(_0x5d4749=_0x4b8e2b%0x4?_0x5d4749*0x40+_0x3621a2:_0x3621a2,_0x4b8e2b++%0x4)?_0x1b03a6+=String['fromCharCode'](0xff&_0x5d4749>>(-0x2*_0x4b8e2b&0x6)):0x0){_0x3621a2=_0x95af1e['indexOf'](_0x3621a2);}for(let _0x60bbc5=0x0,_0x4d10c3=_0x1b03a6['length'];_0x60bbc5<_0x4d10c3;_0x60bbc5++){_0x9a86ca+='%'+('00'+_0x1b03a6['charCodeAt'](_0x60bbc5)['toString'](0x10))['slice'](-0x2);}return decodeURIComponent(_0x9a86ca);};_0x5bc4['ehpBTH']=_0x238263,_0x5bc4['QQolcu']={},_0x5bc4['OBQyLo']=!![];}const _0x117b34=_0x59592b[0x0],_0x1a760c=_0x27b7f9+_0x117b34,_0x4bac8a=_0x5bc4['QQolcu'][_0x1a760c];return!_0x4bac8a?(_0x5bc487=_0x5bc4['ehpBTH'](_0x5bc487),_0x5bc4['QQolcu'][_0x1a760c]=_0x5bc487):_0x5bc487=_0x4bac8a,_0x5bc487;}export function excelFilename(_0x273f8d){const _0x488107=_0x51d162;return _0x273f8d[_0x488107(0xbb)]('.xlsx')?_0x273f8d:_0x273f8d+_0x488107(0xcc);}export function excelResponseHeaders(_0x4aec86){const _0x5d77ec=_0x51d162,_0x25fdd3=excelFilename(_0x4aec86);return{'Content-Type':_0x5d77ec(0xb8),'Content-Disposition':_0x5d77ec(0xc3)+encodeURIComponent(_0x25fdd3)};}

package/dist/shared/index.js

@@ -1,14 +1 @@
-export { merge } from "../comm/merge";
-export { deepTree, flattenTree } from "./tree";
-export {
-  RES_CODE
-} from "../routing/base";
-export {
-  buildExcelBuffer,
-  buildImportTemplateBuffer,
-  parseExcelBuffer,
-  excelFilename,
-  excelResponseHeaders,
-  IMPORT_SKIP_FIELDS,
-  isImportSkipField
-} from "./excel";
+function _0x4b4b(){var _0x4e3fc1=['mtbgrKzJzK0','mJyZnhP0rM5iCa','n0PdBKLjyq','mte0mZG4nJDAEKjqvfC','mZaZmMP2EKPdtW','mZC5mZiZrurIy3nn','mZyZntyYmKfHvvngvG','mZuYmufowLfQCW','nZmWrw9yr3rS','ndGYmZr6qwDyBuu','mtG0mdCWnhLUtLHWvG'];_0x4b4b=function(){return _0x4e3fc1;};return _0x4b4b();}(function(_0x170119,_0x326428){var _0x315c0d=_0x3b2f,_0x5c9256=_0x170119();while(!![]){try{var _0x1a88ed=parseInt(_0x315c0d(0x132))/0x1*(parseInt(_0x315c0d(0x139))/0x2)+parseInt(_0x315c0d(0x135))/0x3+-parseInt(_0x315c0d(0x134))/0x4*(-parseInt(_0x315c0d(0x138))/0x5)+-parseInt(_0x315c0d(0x131))/0x6*(-parseInt(_0x315c0d(0x137))/0x7)+parseInt(_0x315c0d(0x12f))/0x8+parseInt(_0x315c0d(0x136))/0x9+parseInt(_0x315c0d(0x130))/0xa*(-parseInt(_0x315c0d(0x133))/0xb);if(_0x1a88ed===_0x326428)break;else _0x5c9256['push'](_0x5c9256['shift']());}catch(_0x3bad4e){_0x5c9256['push'](_0x5c9256['shift']());}}}(_0x4b4b,0x35ede));export{merge}from'../comm/merge';export{deepTree,flattenTree}from'./tree';export{RES_CODE}from'../routing/base';function _0x3b2f(_0x5247eb,_0xe8754f){_0x5247eb=_0x5247eb-0x12f;var _0x4b4b3e=_0x4b4b();var _0x3b2ff5=_0x4b4b3e[_0x5247eb];if(_0x3b2f['YDVEPC']===undefined){var _0x6db52=function(_0x2998a3){var _0x4468a2='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/=';var _0xcd192c='',_0x41e868='';for(var _0x3d5597=0x0,_0x3ba1d0,_0x478507,_0x488526=0x0;_0x478507=_0x2998a3['charAt'](_0x488526++);~_0x478507&&(_0x3ba1d0=_0x3d5597%0x4?_0x3ba1d0*0x40+_0x478507:_0x478507,_0x3d5597++%0x4)?_0xcd192c+=String['fromCharCode'](0xff&_0x3ba1d0>>(-0x2*_0x3d5597&0x6)):0x0){_0x478507=_0x4468a2['indexOf'](_0x478507);}for(var _0x5b48df=0x0,_0x4296b0=_0xcd192c['length'];_0x5b48df<_0x4296b0;_0x5b48df++){_0x41e868+='%'+('00'+_0xcd192c['charCodeAt'](_0x5b48df)['toString'](0x10))['slice'](-0x2);}return decodeURIComponent(_0x41e868);};_0x3b2f['fXqSpQ']=_0x6db52,_0x3b2f['SaBPee']={},_0x3b2f['YDVEPC']=!![];}var _0x3d3136=_0x4b4b3e[0x0],_0x2be7d8=_0x5247eb+_0x3d3136,_0x4d92b5=_0x3b2f['SaBPee'][_0x2be7d8];return!_0x4d92b5?(_0x3b2ff5=_0x3b2f['fXqSpQ'](_0x3b2ff5),_0x3b2f['SaBPee'][_0x2be7d8]=_0x3b2ff5):_0x3b2ff5=_0x4d92b5,_0x3b2ff5;}export{buildExcelBuffer,buildImportTemplateBuffer,parseExcelBuffer,excelFilename,excelResponseHeaders,IMPORT_SKIP_FIELDS,isImportSkipField}from'./excel';

package/dist/shared/tree.js

@@ -1,39 +1 @@
-export function deepTree(list, sort = "asc") {
-  const map = new Map;
-  for (const row of list) {
-    if (row.id == null)
-      continue;
-    map.set(row.id, { ...row, children: [] });
-  }
-  const roots = [];
-  for (const node of map.values()) {
-    const pid = node.parentId;
-    if (pid != null && pid !== "" && map.has(pid)) {
-      map.get(pid).children.push(node);
-    } else {
-      roots.push(node);
-    }
-  }
-  const sortRec = (arr) => {
-    arr.sort((a, b) => {
-      const ao = a.orderNum ?? 0;
-      const bo = b.orderNum ?? 0;
-      const d = sort === "desc" ? bo - ao : ao - bo;
-      return d || Number(a.id) - Number(b.id);
-    });
-    for (const n of arr)
-      if (n.children?.length)
-        sortRec(n.children);
-  };
-  sortRec(roots);
-  return roots;
-}
-export function flattenTree(nodes, expanded, depth = 0, out = []) {
-  for (const n of nodes) {
-    const kids = n.children || [];
-    out.push({ ...n, depth, hasChildren: kids.length > 0 });
-    if (kids.length && expanded.has(n.id))
-      flattenTree(kids, expanded, depth + 1, out);
-  }
-  return out;
-}
+const _0x458571=_0x3401;function _0x3401(_0x46a042,_0x2f9266){_0x46a042=_0x46a042-0x1da;const _0xc8eebb=_0xc8ee();let _0x3401b3=_0xc8eebb[_0x46a042];if(_0x3401['jqQvDh']===undefined){var _0xecf566=function(_0x40e0ef){const _0x2f4321='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/=';let _0xaeca72='',_0x192546='';for(let _0x590ac8=0x0,_0x2c2a0d,_0x17c42a,_0x55929a=0x0;_0x17c42a=_0x40e0ef['charAt'](_0x55929a++);~_0x17c42a&&(_0x2c2a0d=_0x590ac8%0x4?_0x2c2a0d*0x40+_0x17c42a:_0x17c42a,_0x590ac8++%0x4)?_0xaeca72+=String['fromCharCode'](0xff&_0x2c2a0d>>(-0x2*_0x590ac8&0x6)):0x0){_0x17c42a=_0x2f4321['indexOf'](_0x17c42a);}for(let _0x64be61=0x0,_0x382a38=_0xaeca72['length'];_0x64be61<_0x382a38;_0x64be61++){_0x192546+='%'+('00'+_0xaeca72['charCodeAt'](_0x64be61)['toString'](0x10))['slice'](-0x2);}return decodeURIComponent(_0x192546);};_0x3401['IqrmUb']=_0xecf566,_0x3401['yYdzwY']={},_0x3401['jqQvDh']=!![];}const _0x2ef449=_0xc8eebb[0x0],_0x23e630=_0x46a042+_0x2ef449,_0x154df9=_0x3401['yYdzwY'][_0x23e630];return!_0x154df9?(_0x3401b3=_0x3401['IqrmUb'](_0x3401b3),_0x3401['yYdzwY'][_0x23e630]=_0x3401b3):_0x3401b3=_0x154df9,_0x3401b3;}(function(_0x23bbac,_0x59dee3){const _0xb2d352=_0x3401,_0x41e307=_0x23bbac();while(!![]){try{const _0x15c0d6=parseInt(_0xb2d352(0x1e3))/0x1+parseInt(_0xb2d352(0x1e1))/0x2*(parseInt(_0xb2d352(0x1e8))/0x3)+-parseInt(_0xb2d352(0x1dd))/0x4*(parseInt(_0xb2d352(0x1e9))/0x5)+-parseInt(_0xb2d352(0x1ee))/0x6*(-parseInt(_0xb2d352(0x1e4))/0x7)+-parseInt(_0xb2d352(0x1e5))/0x8+parseInt(_0xb2d352(0x1eb))/0x9+-parseInt(_0xb2d352(0x1e2))/0xa*(parseInt(_0xb2d352(0x1da))/0xb);if(_0x15c0d6===_0x59dee3)break;else _0x41e307['push'](_0x41e307['shift']());}catch(_0x2732cc){_0x41e307['push'](_0x41e307['shift']());}}}(_0xc8ee,0x30c6c));export function deepTree(_0xaeca72,_0x192546=_0x458571(0x1e0)){const _0x3b9987=_0x458571,_0x590ac8=new Map();for(const _0x55929a of _0xaeca72){if(_0x55929a['id']==null)continue;_0x590ac8[_0x3b9987(0x1ea)](_0x55929a['id'],{..._0x55929a,'children':[]});}const _0x2c2a0d=[];for(const _0x64be61 of _0x590ac8[_0x3b9987(0x1ef)]()){const _0x382a38=_0x64be61['parentId'];_0x382a38!=null&&_0x382a38!==''&&_0x590ac8[_0x3b9987(0x1de)](_0x382a38)?_0x590ac8[_0x3b9987(0x1ed)](_0x382a38)[_0x3b9987(0x1e7)][_0x3b9987(0x1db)](_0x64be61):_0x2c2a0d[_0x3b9987(0x1db)](_0x64be61);}const _0x17c42a=_0x330b55=>{const _0x1f0f8a=_0x3b9987;_0x330b55[_0x1f0f8a(0x1df)]((_0x2baa82,_0x366d15)=>{const _0x6c59f4=_0x1f0f8a,_0xa2a2e6=_0x2baa82['orderNum']??0x0,_0x165c0a=_0x366d15[_0x6c59f4(0x1ec)]??0x0,_0x1654b4=_0x192546===_0x6c59f4(0x1dc)?_0x165c0a-_0xa2a2e6:_0xa2a2e6-_0x165c0a;return _0x1654b4||Number(_0x2baa82['id'])-Number(_0x366d15['id']);});for(const _0x1031f8 of _0x330b55)if(_0x1031f8[_0x1f0f8a(0x1e7)]?.['length'])_0x17c42a(_0x1031f8[_0x1f0f8a(0x1e7)]);};return _0x17c42a(_0x2c2a0d),_0x2c2a0d;}export function flattenTree(_0x2776f1,_0x164fee,_0x9b5860=0x0,_0x14921b=[]){const _0xf7d4e1=_0x458571;for(const _0x41bbec of _0x2776f1){const _0x2a65ef=_0x41bbec[_0xf7d4e1(0x1e7)]||[];_0x14921b['push']({..._0x41bbec,'depth':_0x9b5860,'hasChildren':_0x2a65ef[_0xf7d4e1(0x1e6)]>0x0});if(_0x2a65ef[_0xf7d4e1(0x1e6)]&&_0x164fee[_0xf7d4e1(0x1de)](_0x41bbec['id']))flattenTree(_0x2a65ef,_0x164fee,_0x9b5860+0x1,_0x14921b);}return _0x14921b;}function _0xc8ee(){const _0x52e715=['mtm1odH6vfDTtNi','mti2uu5Tu1zj','mJe2otaYnePcyu5ruW','BgvUz3rO','y2HPBgrYzw4','nLHivK1UAa','nw9Itwnewa','C2v0','mtq0mJmYmNzbrvjKyG','B3jKzxjoDw0','z2v0','odq1ntjADfLfqxq','DMfSDwvZ','mteXotHsEMPSt1K','ChvZAa','zgvZyW','mtm0mJe2D0znruzb','AgfZ','C29YDa','yxnJ','mtaWmZGYwKnuB3rK','mJmWre1eEwXK'];_0xc8ee=function(){return _0x52e715;};return _0xc8ee();}

package/dist/src/orm/join-tables.d.ts

@@ -0,0 +1,12 @@
+import { type PgTable } from 'drizzle-orm/pg-core';
+import type { QueryJoin, QueryJoinType, QueryOp } from '../../typings/routing/crud';
+export type JoinTableMap = Record<string, PgTable>;
+/** 解析联表别名：显式 alias 优先；否则 join[0]=b、join[1]=c… */
+export declare function resolveJoinAlias(join: QueryJoin, index: number): string;
+/** 主表 a + 各 join 的 drizzle alias 表 */
+export declare function buildJoinTables(main: PgTable, op: QueryOp): JoinTableMap;
+/** 解析 `a.skinId = b.id` 形式等值条件 */
+export declare function parseJoinCondition(condition: string, tables: JoinTableMap): import("drizzle-orm").SQL<unknown>;
+export declare function resolveJoinOn(join: QueryJoin, index: number, main: PgTable, tables: JoinTableMap): unknown;
+export declare function joinTypeOf(join: QueryJoin): QueryJoinType;
+export declare function getJoinEntity(join: QueryJoin): unknown;

package/dist/src/orm/query-op.d.ts

@@ -8,12 +8,21 @@ export declare function compactWhere(result: QueryWhereResult | undefined): SQL[
  *
  * - `between` / `range`：缺参自动跳过
  * - `eqRest`：剩余 body 字段等值，可用 map 指到 join 列
- * - `contains`：PG 数组列包含
+ * - `contains`：数组包含（fieldArray）；按库类型分支
  */
 export declare const q: {
     between(col: unknown, min: unknown, max: unknown): SQL | undefined;
     range(col: unknown, start: unknown, end: unknown): SQL | undefined;
     eqRest(params: Record<string, unknown>, table: PgTable, map?: Record<string, unknown>): SQL[];
+    /**
+     * 数组包含（fieldArray / 业务手写）：
+     * - PostgreSQL `integer[]`：arrayContains / arrayOverlaps
+     * - PostgreSQL `json`/`jsonb`：`@>`
+     * - MySQL / MariaDB：列用 `json`，`JSON_CONTAINS`
+     * - SQLite：列用 `json`/`text` JSON，`json_each`
+     *
+     * MySQL/SQLite 无原生数组类型，tagIds 等请用 `json().$type<number[]>()`。
+     */
     contains(col: unknown, value: unknown): SQL | undefined;
 };
 /** 是否需要 join/select（须走 queryWithOp；where/extend 拼进 where 后走 Service） */

package/dist/typings/routing/crud.d.ts

@@ -31,13 +31,27 @@ export type QueryFieldRange = {
 /** join 类型 */
 export type QueryJoinType = 'join' | 'leftJoin' | 'innerJoin';
 /**
- * Join 配置（宿主解释为 Drizzle pgTable）
- * `on(main)` 返回 SQL 条件，main 为主表
+ * Join 配置（Drizzle pgTable）。
+ * - 主表固定别名 `a`
+ * - 联表须显式 `alias`（同表可多次 join，如 b/c）；未写时兼容旧序：join[0]=b…
+ * - `condition`: `"a.skinId = b.id"` 等值；或 `on(tables)` / 旧版 `on(main)`
  */
 export type QueryJoin = {
-    table: unknown;
+    /** Drizzle pgTable；与 entity 同义 */
+    table?: unknown;
+    /** 同 table（便于业务侧命名） */
+    entity?: unknown;
+    /** 联表别名，如 b / c / f；不可为 a */
+    alias?: string;
     type?: QueryJoinType;
-    on: (main: any) => unknown;
+    /** 等值条件，如 `a.skinId = b.id` */
+    condition?: string;
+    /**
+     * 联表 ON：
+     * - 新：`(tables) => eq(tables.a.skinId, tables.b.id)`（tables 含 a 与各 alias）
+     * - 旧：`(main) => eq(main.skinId, other.id)`（无 alias 时）
+     */
+    on?: (mainOrTables: any) => unknown;
 };
 /** where / extend 上下文 */
 export type QueryOpCtx = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vome-core",
-  "version": "0.0.49",
+  "version": "0.0.52",
   "description": "Vome framework — shared + Bun/Elysia server + Vue admin",
   "license": "MIT",
   "type": "module",

package/typings/admin/comm/crud.d.ts

@@ -71,10 +71,10 @@ export type CrudSearchItem = {
     label: string;
     type?: 'input' | 'select' | 'date' | 'daterange' | 'number-range';
     placeholder?: string;
-    options?: Array<{
+    options?: MaybeRefOrGetter<Array<{
         label: string;
         value: string | number | boolean;
-    }>;
+    }>>;
     /** 业务字典 type.key；有则拉 options */
     dict?: string;
     /** 下拉多选 */

package/typings/admin/comm/crud.ts

@@ -60,7 +60,7 @@ export type CrudSearchItem = {
   label: string
   type?: 'input' | 'select' | 'date' | 'daterange' | 'number-range'
   placeholder?: string
-  options?: Array<{ label: string; value: string | number | boolean }>
+  options?: MaybeRefOrGetter<Array<{ label: string; value: string | number | boolean }>>
   /** 业务字典 type.key；有则拉 options */
   dict?: string
   /** 下拉多选 */