openxiangda-cli 2.0.0-alpha.62 → 2.0.0-alpha.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda-cli",
-  "version": "2.0.0-alpha.62",
+  "version": "2.0.0-alpha.67",
   "description": "Thin application-level CLI for OpenXiangda 2.0.",
   "type": "module",
   "main": "./dist/index.js",
@@ -23,9 +23,9 @@
   ],
   "dependencies": {
     "@oclif/core": "4.13.3",
-    "openxiangda-contracts": "2.0.0-alpha.30",
-    "openxiangda-devkit-core": "2.0.0-alpha.38",
-    "openxiangda-mcp": "2.0.0-alpha.38"
+    "openxiangda-contracts": "2.0.0-alpha.31",
+    "openxiangda-devkit-core": "2.0.0-alpha.41",
+    "openxiangda-mcp": "2.0.0-alpha.41"
   },
   "devDependencies": {
     "tsx": "4.23.12",

package/template/apps/server/Dockerfile

@@ -4,7 +4,8 @@ RUN corepack enable
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml tsconfig.base.json ./
 COPY apps/server/package.json apps/server/package.json
 COPY packages/contracts/package.json packages/contracts/package.json
-RUN pnpm --filter @app/server... install --frozen-lockfile --ignore-scripts
+RUN node -e "const fs=require('node:fs'); const p=JSON.parse(fs.readFileSync('package.json','utf8')); delete p.devDependencies; fs.writeFileSync('package.json', JSON.stringify(p));"
+RUN pnpm --filter @app/server --filter @app/contracts install --no-frozen-lockfile --ignore-scripts
 COPY apps/server apps/server
 COPY packages/contracts packages/contracts
 RUN pnpm --filter @app/server... build

package/template/apps/server/package.json

@@ -15,7 +15,7 @@
     "@nestjs/common": "11.1.29",
     "@nestjs/core": "11.1.29",
     "@nestjs/platform-fastify": "11.1.29",
-    "openxiangda-nest": "2.0.0-alpha.36",
+    "openxiangda-nest": "2.0.0-alpha.37",
     "reflect-metadata": "0.2.2",
     "rxjs": "7.8.2"
   },

package/template/apps/web/package.json

@@ -16,7 +16,7 @@
     "antd": "6.4.3",
     "dayjs": "1.11.18",
     "docx-preview": "0.3.7",
-    "openxiangda-contracts": "2.0.0-alpha.30",
+    "openxiangda-contracts": "2.0.0-alpha.31",
     "react": "19.2.8",
     "react-dom": "19.2.8",
     "react-router-dom": "7.8.2",

package/template/apps/web/src/AuthoritativeSelector.tsx

@@ -107,6 +107,19 @@ function optionDescription(option: Option) {
   return option.description || '';
 }
 
+export type AuthoritativeSelectorProps = {
+  value?: string | string[];
+  onChange?: (value: string | string[] | undefined) => void;
+  source: Source;
+  operation: 'create' | 'update';
+  multiple?: boolean;
+  disabled?: boolean;
+  id?: string;
+  placeholder: string;
+  resourceCode?: string;
+  labelField?: string;
+};
+
 export function AuthoritativeSelector({
   value,
   onChange,
@@ -118,18 +131,7 @@ export function AuthoritativeSelector({
   placeholder,
   resourceCode,
   labelField,
-}: {
-  value?: string | string[];
-  onChange?: (value: string | string[] | undefined) => void;
-  source: Source;
-  operation: 'create' | 'update';
-  multiple?: boolean;
-  disabled?: boolean;
-  id?: string;
-  placeholder: string;
-  resourceCode?: string;
-  labelField?: string;
-}) {
+}: AuthoritativeSelectorProps) {
   const [options, setOptions] = useState<Option[]>([]);
   const [keyword, setKeyword] = useState('');
   const [cursor, setCursor] = useState<string | null>(null);
@@ -199,6 +201,30 @@ export function AuthoritativeSelector({
     return () => window.clearTimeout(timer);
   }, [disabled, keyword, labelField, operation, resourceCode, source, values]);
 
+  useEffect(() => {
+    if (disabled || !open || keyword.trim().length >= 2) return;
+    const sequence = ++requestSequence.current;
+    setLoading(true);
+    setError('');
+    void searchSource(source, operation, '', undefined, resourceCode, labelField)
+      .then(page => {
+        if (sequence !== requestSequence.current) return;
+        setOptions(current => {
+          const selected = current.filter(option => values.includes(option.value));
+          return mergeOptions(selected, page.items);
+        });
+        setCursor(page.nextCursor);
+      })
+      .catch(reason => {
+        if (sequence === requestSequence.current) {
+          setError(reason instanceof Error ? reason.message : String(reason));
+        }
+      })
+      .finally(() => {
+        if (sequence === requestSequence.current) setLoading(false);
+      });
+  }, [disabled, keyword, labelField, open, operation, resourceCode, source, values]);
+
   const loadNext = () => {
     if (!cursor || loading) return;
     const nextCursor = cursor;
@@ -236,7 +262,7 @@ export function AuthoritativeSelector({
         ) : error ? (
           <Typography.Text type="danger">{error}</Typography.Text>
         ) : keyword.trim().length < 2 ? (
-          '请输入至少 2 个字符'
+          '暂无可选数据，可输入至少 2 个字符搜索'
         ) : (
           '无可选数据'
         )
@@ -245,7 +271,10 @@ export function AuthoritativeSelector({
         onChange?.(next || undefined);
         if (!multiple) setOpen(false);
       }}
-      onOpenChange={setOpen}
+      onOpenChange={next => {
+        setOpen(next);
+        if (!next) setKeyword('');
+      }}
       onPopupScroll={event => {
         const element = event.currentTarget;
         if (
@@ -319,6 +348,225 @@ export function AuthoritativeSelector({
   );
 }
 
+/**
+ * Mobile reference picker. It deliberately avoids Ant Design Select so that
+ * resource references have a touch-friendly, full-width interaction on
+ * phones. The search and resolve calls are the same authoritative platform
+ * APIs used by the desktop selector.
+ */
+export function MobileAuthoritativeSelector({
+  value,
+  onChange,
+  source,
+  operation,
+  multiple = false,
+  disabled = false,
+  id,
+  placeholder,
+  resourceCode,
+  labelField,
+}: AuthoritativeSelectorProps) {
+  const [options, setOptions] = useState<Option[]>([]);
+  const [keyword, setKeyword] = useState('');
+  const [cursor, setCursor] = useState<string | null>(null);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState('');
+  const [open, setOpen] = useState(false);
+  const [draftValues, setDraftValues] = useState<string[]>([]);
+  const requestSequence = useRef(0);
+  const values = useMemo(
+    () => (Array.isArray(value) ? value : value ? [value] : []),
+    [value]
+  );
+
+  useEffect(() => {
+    setDraftValues(values);
+  }, [open, values]);
+
+  useEffect(() => {
+    const missing = values.filter(
+      selected => !options.some(option => option.value === selected)
+    );
+    if (missing.length === 0) return;
+    let active = true;
+    setLoading(true);
+    void resolveSource(source, operation, missing, resourceCode, labelField)
+      .then(items => {
+        if (active) setOptions(current => mergeOptions(current, items));
+      })
+      .catch(reason => {
+        if (active) setError(reason instanceof Error ? reason.message : String(reason));
+      })
+      .finally(() => {
+        if (active) setLoading(false);
+      });
+    return () => {
+      active = false;
+    };
+  }, [labelField, operation, options, resourceCode, source, values]);
+
+  useEffect(() => {
+    if (disabled || !open) return;
+    const trimmed = keyword.trim();
+    if (trimmed.length > 0 && trimmed.length < 2) return;
+    const sequence = ++requestSequence.current;
+    const timer = window.setTimeout(() => {
+      setLoading(true);
+      setError('');
+      void searchSource(source, operation, trimmed, undefined, resourceCode, labelField)
+        .then(page => {
+          if (sequence !== requestSequence.current) return;
+          setOptions(current => {
+            const selected = current.filter(option => values.includes(option.value));
+            return mergeOptions(selected, page.items);
+          });
+          setCursor(page.nextCursor);
+        })
+        .catch(reason => {
+          if (sequence === requestSequence.current) {
+            setError(reason instanceof Error ? reason.message : String(reason));
+          }
+        })
+        .finally(() => {
+          if (sequence === requestSequence.current) setLoading(false);
+        });
+    }, trimmed ? 300 : 0);
+    return () => window.clearTimeout(timer);
+  }, [disabled, keyword, labelField, open, operation, resourceCode, source, values]);
+
+  const loadNext = () => {
+    if (!cursor || loading) return;
+    const nextCursor = cursor;
+    setLoading(true);
+    setError('');
+    void searchSource(source, operation, keyword.trim(), nextCursor, resourceCode, labelField)
+      .then(page => {
+        setOptions(current => mergeOptions(current, page.items));
+        setCursor(page.nextCursor);
+      })
+      .catch(reason => setError(reason instanceof Error ? reason.message : String(reason)))
+      .finally(() => setLoading(false));
+  };
+
+  const selectedItems = values
+    .map(selected => options.find(option => option.value === selected))
+    .filter((item): item is Option => Boolean(item));
+  const selectedLabel = selectedItems.length
+    ? selectedItems.map(item => item.label).join('、')
+    : values.length
+      ? (loading ? '读取中…' : values.join('、'))
+      : `请选择${placeholder}`;
+
+  const toggleValue = (nextValue: string) => {
+    const item = options.find(option => option.value === nextValue);
+    if (!item?.selectable) return;
+    if (!multiple) {
+      onChange?.(nextValue);
+      setOpen(false);
+      return;
+    }
+    setDraftValues(current =>
+      current.includes(nextValue)
+        ? current.filter(itemValue => itemValue !== nextValue)
+        : [...current, nextValue]
+    );
+  };
+
+  return (
+    <>
+      <button
+        aria-haspopup="dialog"
+        className="oxa-mobile-reference-trigger"
+        disabled={disabled}
+        id={id}
+        onClick={() => {
+          setDraftValues(values);
+          setKeyword('');
+          setOpen(true);
+        }}
+        type="button"
+      >
+        <span className={values.length ? '' : 'oxa-mobile-reference-placeholder'}>
+          {selectedLabel}
+        </span>
+        <span aria-hidden="true">⌄</span>
+      </button>
+      {open && (
+        <div
+          aria-label={placeholder}
+          aria-modal="true"
+          className="oxa-mobile-reference-backdrop"
+          onClick={() => setOpen(false)}
+          role="dialog"
+        >
+          <div className="oxa-mobile-reference-sheet" onClick={event => event.stopPropagation()}>
+            <div className="oxa-mobile-reference-header">
+              <strong>{placeholder}</strong>
+              <button onClick={() => setOpen(false)} type="button">关闭</button>
+            </div>
+            <input
+              autoFocus
+              className="oxa-mobile-input oxa-mobile-reference-search"
+              onChange={event => setKeyword(event.target.value)}
+              placeholder={`搜索${placeholder}`}
+              type="search"
+              value={keyword}
+            />
+            {error && <div className="oxa-mobile-reference-error">{error}</div>}
+            {loading && <div className="oxa-mobile-reference-loading">加载中…</div>}
+            {!loading && !error && options.length === 0 && (
+              <div className="oxa-mobile-reference-empty">
+                {keyword.trim().length < 2 ? '请输入至少 2 个字符搜索' : '暂无可选数据'}
+              </div>
+            )}
+            <div aria-multiselectable={multiple} className="oxa-mobile-reference-options" role="listbox">
+              {options.map(option => {
+                const selected = (multiple ? draftValues : values).includes(option.value);
+                const description = optionDescription(option);
+                return (
+                  <button
+                    aria-selected={selected}
+                    className={`oxa-mobile-reference-option${selected ? ' is-selected' : ''}`}
+                    disabled={!option.selectable}
+                    key={option.value}
+                    onClick={() => toggleValue(option.value)}
+                    role="option"
+                    type="button"
+                  >
+                    {optionIcon(option)}
+                    <span className="oxa-mobile-reference-option-copy">
+                      <strong>{option.label}</strong>
+                      {description && <small>{description}</small>}
+                    </span>
+                    {selected && <span aria-hidden="true">✓</span>}
+                  </button>
+                );
+              })}
+            </div>
+            {cursor && (
+              <button className="oxa-mobile-reference-more" onClick={loadNext} type="button">
+                {loading ? '加载中…' : '加载更多'}
+              </button>
+            )}
+            {multiple && (
+              <button
+                className="oxa-mobile-reference-confirm"
+                onClick={() => {
+                  onChange?.(draftValues.length ? draftValues : undefined);
+                  setOpen(false);
+                }}
+                type="button"
+              >
+                确定（{draftValues.length}）
+              </button>
+            )}
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
+
 export function ResolvedValueText({
   source,
   value,