lan-low-code-cli 2.0.0 → 2.2.0

package/dist/relation.js

@@ -0,0 +1,130 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseRelationSpecs = parseRelationSpecs;
+exports.appIdOfForm = appIdOfForm;
+exports.resolveRelations = resolveRelations;
+const formDefine_1 = require("./api/formDefine");
+/** 解析 `--relation`：`字段名=目标表单[:显示值=字段1,字段2][:显示项=字段1,字段2]` */
+function parseRelationSpecs(raw) {
+    return raw.map((item) => {
+        const text = item.trim();
+        const eq = text.indexOf('=');
+        if (eq <= 0) {
+            throw new Error(`--relation 格式错误：${item}，应为 "字段名=目标表单[:显示值=字段][:显示项=字段1,字段2]"`);
+        }
+        const fieldName = text.slice(0, eq).trim();
+        const rest = text.slice(eq + 1);
+        const [targetRaw, ...optionParts] = rest.split(':');
+        const target = targetRaw.trim();
+        if (!fieldName || !target) {
+            throw new Error(`--relation 格式错误：${item}，字段名与目标表单都不能为空`);
+        }
+        const parsed = { fieldName, target };
+        for (const part of optionParts) {
+            const trimmed = part.trim();
+            if (!trimmed)
+                continue;
+            const sep = trimmed.indexOf('=');
+            if (sep <= 0) {
+                throw new Error(`--relation 选项格式错误：${part}（应为 显示值=字段 或 显示项=字段1,字段2）`);
+            }
+            const name = trimmed.slice(0, sep).trim();
+            const values = trimmed
+                .slice(sep + 1)
+                .split(',')
+                .map((v) => v.trim())
+                .filter(Boolean);
+            if (!values.length)
+                throw new Error(`--relation 选项 ${name} 不能为空（${part}）`);
+            if (name === '显示值' || name === 'refField' || name === 'ref') {
+                parsed.refFields = values;
+            }
+            else if (name === '显示项' || name === 'columns') {
+                parsed.columns = values;
+            }
+            else {
+                throw new Error(`--relation 不支持的选项：${name}（支持 显示值 / 显示项）`);
+            }
+        }
+        return parsed;
+    });
+}
+/** 查找业务对象表单：按 fdId 或表单名（同名多份时优先与当前表单同应用） */
+async function findTargetForm(client, key, currentAppId) {
+    const byId = /^[0-9a-z]{20,}$/i.test(key);
+    const page = await formDefine_1.modelingXFormApi.query(client, {
+        conditions: byId ? { fdId: key } : { fdName: key },
+    });
+    const list = (page.content ?? []);
+    if (!list.length)
+        throw new Error(`未找到业务对象（目标表单）：${key}`);
+    if (list.length > 1) {
+        const same = currentAppId ? list.filter((f) => f.fdApp?.fdId === currentAppId) : [];
+        if (same.length === 1)
+            return same[0];
+        throw new Error(`业务对象「${key}」匹配到 ${list.length} 个表单，请改用 fdId 指定：` +
+            list.map((f) => `${f.fdName}（${f.fdId}／应用 ${f.fdApp?.fdName ?? '-'}）`).join('；'));
+    }
+    return list[0];
+}
+/** 查询表单所属应用 id（业务对象同名消歧用） */
+async function appIdOfForm(client, formId) {
+    const page = await formDefine_1.modelingXFormApi.query(client, { conditions: { fdId: formId } });
+    const first = (page.content ?? [])[0];
+    return first?.fdApp?.fdId;
+}
+/** 目标表单主表的业务字段（非系统、显示） */
+function businessFields(main) {
+    return (main?.fdFields ?? []).filter((f) => !f.fdIsSystem && f.fdDisplay !== false);
+}
+/**
+ * 查询环境解析业务关联：定位目标表单 → 取主表字段 → 构造 `IRelationSpec`。
+ *
+ * @param currentAppId 当前表单所属应用（同名表单消歧用）
+ */
+async function resolveRelations(client, parsed, currentAppId) {
+    const specs = [];
+    for (const item of parsed) {
+        const form = await findTargetForm(client, item.target, currentAppId);
+        const design = await formDefine_1.modelingXFormApi.loadDesign(client, form.fdId);
+        const cfg = typeof design.fdConfig === 'string' ? JSON.parse(design.fdConfig) : design.fdConfig;
+        const main = (cfg?.dataModel ?? []).find((m) => m.fdType === 'main');
+        const fields = businessFields(main);
+        if (!fields.length)
+            throw new Error(`业务对象「${form.fdName}」主表没有可用业务字段`);
+        const labelOf = new Map(fields.map((f) => [f.fdName, f.fdLabel || f.fdName]));
+        // 显示项：缺省为该表全部业务字段
+        const columnNames = item.columns?.length ? item.columns : fields.map((f) => f.fdName);
+        const unknownColumns = columnNames.filter((n) => !labelOf.has(n));
+        if (unknownColumns.length) {
+            throw new Error(`业务对象「${form.fdName}」中不存在显示项字段：${unknownColumns.join('、')}；` +
+                `可用字段：${fields.map((f) => f.fdName).join('、')}`);
+        }
+        // 显示值：缺省取首个文本类业务字段（无则取第一个业务字段）
+        const refNames = item.refFields ??
+            [
+                fields.find((f) => ['text', 'textarea'].includes(String(f.fdType)))?.fdName ??
+                    fields[0].fdName,
+            ];
+        const unknownRefs = refNames.filter((n) => !labelOf.has(n));
+        if (unknownRefs.length) {
+            throw new Error(`业务对象「${form.fdName}」中不存在显示值字段：${unknownRefs.join('、')}；` +
+                `可用字段：${fields.map((f) => f.fdName).join('、')}`);
+        }
+        specs.push({
+            fieldName: item.fieldName,
+            target: {
+                // appCode 存的是应用 fdId（与真实表单一致）
+                appCode: form.fdApp?.fdId ?? '',
+                xformName: form.fdName,
+                modelId: form.fdId,
+                tableName: main?.fdTableName ?? form.fdTableName ?? '',
+                fdFormType: form.fdType ?? 0,
+            },
+            refFieldName: refNames.map((n) => `$${n}$`).join(''),
+            showFields: refNames.map((n) => `$${labelOf.get(n)}$`).join(''),
+            columns: columnNames.map((n) => ({ name: n, label: labelOf.get(n) })),
+        });
+    }
+    return specs;
+}

package/dist/widgets.js

@@ -4,6 +4,7 @@ exports.WidgetRegistry = void 0;
 exports.originOf = originOf;
 exports.collectWidgetDefaults = collectWidgetDefaults;
 exports.hasConfigItem = hasConfigItem;
+exports.collectFrontExtendKeys = collectFrontExtendKeys;
 exports.validateRequiredProps = validateRequiredProps;
 exports.elementLangKey = elementLangKey;
 const fs_1 = require("fs");
@@ -60,6 +61,40 @@ function hasConfigItem(meta, key) {
     });
     return found;
 }
+/**
+ * 收集控件 `config.json` 中声明为「前端扩展数据」（`frontExtendData`）的属性项。
+ *
+ * 平台把这类属性**同时**存在两处：控件属性 `controlProps` 与数据项
+ * `fdFontExtendData`（前端 `syncApi.frontExtendData2Config` 用它反向同步，
+ * 公式/接口 Schema 的 `$ref` 也依赖它，如 address 的 `orgTypeArr`）。
+ *
+ * 声明形式：
+ * - `frontExtendData: true` → 键自身（如 address 的 `range` / `multi`）；
+ * - `frontExtendData: { children: ['orgTypeArr', …] }` → 取 `controlProps[键]` 的子键
+ *   （如 address 的 `org.orgTypeArr`）。
+ *
+ * @returns `path` 为在 controlProps 中的取值路径，`key` 为写入 fdFontExtendData 的键
+ */
+function collectFrontExtendKeys(meta) {
+    const out = [];
+    walkConfig(meta?.config, (item) => {
+        const decl = item.frontExtendData;
+        if (!decl || typeof item.key !== 'string')
+            return;
+        if (decl === true) {
+            out.push({ path: item.key, key: item.key });
+            return;
+        }
+        const children = decl.children;
+        if (Array.isArray(children)) {
+            for (const child of children) {
+                if (typeof child === 'string')
+                    out.push({ path: `${item.key}.${child}`, key: child });
+            }
+        }
+    });
+    return out;
+}
 /**
  * 校验控件必填属性值（对齐设计器发布前校验）。
  *
@@ -120,10 +155,10 @@ function validateRequiredProps(meta, config) {
         if ((value === undefined || value === null || value === '') && item.type === 'inputLocale') {
             value = labelProps.title ?? controlProps.title;
         }
-        const empty = value === undefined ||
-            value === null ||
-            value === '' ||
-            (Array.isArray(value) && value.length === 0);
+        // 空数组**不算空**：设计器规则是 `{ required: true, message }`（不带 type），
+        // async-validator 的 isEmptyValue 仅在 `type === 'array'` 时把 `[]` 判为空，
+        // 因此设计器允许保存 `preSelectValue: []`（address/地址本自定义范围的真实结构）。
+        const empty = value === undefined || value === null || value === '';
         if (empty) {
             errors.push({ key: item.key, label: String(item.label ?? item.key) });
         }

package/package.json

@@ -1,43 +1,45 @@
-{
-  "name": "lan-low-code-cli",
-  "version": "2.0.0",
-  "description": "lan-low-code cli：低代码表单引擎命令行工具（创建表单、获取可用字段、自动完善表单字段）",
-  "keywords": [
-    "low-code",
-    "lan-low-code",
-    "llc",
-    "form",
-    "cli"
-  ],
-  "license": "MIT",
-  "bin": {
-    "llc": "bin/llc.js"
-  },
-  "main": "dist/index.js",
-  "dependencies": {
-    "commander": "^11.1.0"
-  },
-  "devDependencies": {
-    "@types/node": "^20.11.30",
-    "rimraf": "^5.0.5",
-    "typescript": "^5.4.5"
-  },
-  "engines": {
-    "node": ">=18",
-    "pnpm": ">=8"
-  },
-  "files": [
-    "bin",
-    "dist",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "clean": "rimraf dist",
-    "rebuild": "pnpm run clean && pnpm run build",
-    "start": "pnpm run build && node bin/llc.js",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "bump": "node scripts/bump-version.js",
-    "bump:check": "node scripts/bump-version.js --check"
-  }
-}
+{
+  "name": "lan-low-code-cli",
+  "version": "2.2.0",
+  "description": "lan-low-code cli：低代码表单引擎命令行工具（创建表单、获取可用字段、自动完善表单字段）",
+  "keywords": [
+    "low-code",
+    "lan-low-code",
+    "llc",
+    "form",
+    "cli"
+  ],
+  "license": "MIT",
+  "packageManager": "pnpm@10.26.2",
+  "bin": {
+    "llc": "bin/llc.js"
+  },
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "clean": "rimraf dist",
+    "rebuild": "pnpm run clean && pnpm run build",
+    "start": "pnpm run build && node bin/llc.js",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "prepare": "pnpm run build",
+    "bump": "node scripts/bump-version.js",
+    "bump:check": "node scripts/bump-version.js --check"
+  },
+  "dependencies": {
+    "commander": "^11.1.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.11.30",
+    "rimraf": "^5.0.5",
+    "typescript": "^5.4.5"
+  },
+  "engines": {
+    "node": ">=18",
+    "pnpm": ">=8"
+  },
+  "files": [
+    "bin",
+    "dist",
+    "README.md"
+  ]
+}