@gadmin2n/schematics 0.0.71 → 0.0.72

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/canvas/CanvasPage.tsx

@@ -148,7 +148,6 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
     id: string;
     componentType: string;
     code: string;
-    mode: 'api' | 'sql';
   } | null>(null);
 
   // ── PromptModal state（通用文本输入弹窗）──
@@ -178,7 +177,7 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
       skill?: string,
     ) => {
       const prompt = generatePrompt({
-        skill: skill ?? 'canvas-data-query',
+        skill: skill ?? 'canvas-sql-query',
         pageInfo: agent?.pageInfo ?? {
           resourceName: '',
           pageType: 'unknown',
@@ -456,7 +455,7 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
           {
             key: 'data-source',
             icon: <DatabaseOutlined />,
-            label: t('canvas.dataSource.api'),
+            label: t('canvas.dataSource.label'),
             onClick: () => {
               if (
                 componentType === 'NumCard' ||
@@ -469,51 +468,11 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
                   id: itemMenu.id,
                   componentType,
                   code: item?.code ?? '',
-                  mode: 'api',
                 });
               } else {
-                // 其他组件：弹 modal 收集描述后触发 agent
                 menuActionContext.showPrompt({
-                  label: t('canvas.dataSource.api'),
-                  placeholder: t('canvas.dataSource.apiPlaceholder'),
-                  defaultValue: '',
-                  onConfirm: (value) => {
-                    if (!value.trim()) return;
-                    triggerDataSourceAgent(
-                      itemMenu.id,
-                      componentType,
-                      item?.code ?? '',
-                      value.trim(),
-                    );
-                  },
-                });
-              }
-              setItemMenu(null);
-            },
-          },
-          {
-            key: 'data-source-sql',
-            icon: <DatabaseOutlined />,
-            label: t('canvas.dataSource.sql'),
-            onClick: () => {
-              if (
-                componentType === 'NumCard' ||
-                componentType === 'Table' ||
-                componentType === 'BarChart' ||
-                componentType === 'LineChart' ||
-                componentType === 'RadarChart'
-              ) {
-                setDataSourceModal({
-                  id: itemMenu.id,
-                  componentType,
-                  code: item?.code ?? '',
-                  mode: 'sql',
-                });
-              } else {
-                // 其他组件：弹通用输入 modal
-                menuActionContext.showPrompt({
-                  label: t('canvas.dataSource.sql'),
-                  placeholder: t('canvas.dataSource.sqlPlaceholder'),
+                  label: t('canvas.dataSource.label'),
+                  placeholder: t('canvas.dataSource.placeholder'),
                   defaultValue: '',
                   onConfirm: (value) => {
                     if (!value.trim()) return;
@@ -973,9 +932,7 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
               dataSourceModal.componentType,
               newCode,
               userPrompt || undefined,
-              dataSourceModal.mode === 'sql'
-                ? 'canvas-sql-query'
-                : 'canvas-data-query',
+              'canvas-sql-query',
             );
           }}
           onCancel={() => setDataSourceModal(null)}
@@ -1048,9 +1005,7 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
               dataSourceModal.componentType,
               newCode,
               userPrompt,
-              dataSourceModal.mode === 'sql'
-                ? 'canvas-sql-query'
-                : 'canvas-data-query',
+              'canvas-sql-query',
             );
           }}
           onCancel={() => setDataSourceModal(null)}
@@ -1141,9 +1096,7 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
               'BarChart',
               newCode,
               userPrompt,
-              dataSourceModal.mode === 'sql'
-                ? 'canvas-sql-query'
-                : 'canvas-data-query',
+              'canvas-sql-query',
             );
           }}
           onCancel={() => setDataSourceModal(null)}
@@ -1316,9 +1269,7 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
               'LineChart',
               newCode,
               userPrompt || undefined,
-              dataSourceModal.mode === 'sql'
-                ? 'canvas-sql-query'
-                : 'canvas-data-query',
+              'canvas-sql-query',
             );
           }}
           onCancel={() => setDataSourceModal(null)}
@@ -1344,9 +1295,7 @@ const CanvasPage: React.FC<CanvasPageProps> = ({
               dataSourceModal.componentType,
               dataSourceModal.code,
               userPrompt,
-              dataSourceModal.mode === 'sql'
-                ? 'canvas-sql-query'
-                : 'canvas-data-query',
+              'canvas-sql-query',
             );
           }}
           onCancel={() => setDataSourceModal(null)}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/canvas/CanvasToolbar.tsx

@@ -36,8 +36,8 @@ const CanvasToolbar: React.FC<CanvasToolbarProps> = ({
   onPreview,
 }) => {
   const { t } = useTranslation();
-  const [expanded, setExpanded] = useState(false);
-  const [everExpanded, setEverExpanded] = useState(false);
+  const [expanded, setExpanded] = useState(true);
+  const [everExpanded, setEverExpanded] = useState(true);
 
   const handleToggle = useCallback(() => {
     setExpanded((prev) => {

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/canvas/ComponentThumbnail.tsx

@@ -90,7 +90,9 @@ const ComponentThumbnail: React.FC<Props> = memo(
           setTimeout(() => {
             try {
               r.unmount();
-            } catch {}
+            } catch {
+              /* unmount may fail if already unmounted */
+            }
           }, 0);
         }
         if (s && s.parentNode) {

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/canvas/canvasContextMenuRegistry.tsx

@@ -161,29 +161,29 @@ function numCardActions(
     ...(isWithChart
       ? [
           {
-            key: 'toggle-axes',
-            icon: /showAxes\s*=\s*\{true\}/.test(code) ? (
+            key: 'toggle-axis',
+            icon: /showAxis\s*=\s*\{true\}/.test(code) ? (
               <MinusOutlined />
             ) : (
               <PlusOutlined />
             ),
-            danger: /showAxes\s*=\s*\{true\}/.test(code) ? true : undefined,
-            label: /showAxes\s*=\s*\{true\}/.test(code)
-              ? (t?.('canvas.menu.hideAxes') ?? '隐藏坐标轴')
-              : (t?.('canvas.menu.showAxes') ?? '显示坐标轴'),
+            danger: /showAxis\s*=\s*\{true\}/.test(code) ? true : undefined,
+            label: /showAxis\s*=\s*\{true\}/.test(code)
+              ? (t?.('canvas.menu.hideAxis') ?? '隐藏坐标轴')
+              : (t?.('canvas.menu.showAxis') ?? '显示坐标轴'),
             onClick: () => {
               let newCode = code;
-              const hasAxes = /showAxes\s*=\s*\{true\}/.test(newCode);
-              if (hasAxes) {
-                newCode = newCode.replace(/\s*showAxes\s*=\s*\{true\}/, '');
+              const hasAxis = /showAxis\s*=\s*\{true\}/.test(newCode);
+              if (hasAxis) {
+                newCode = newCode.replace(/\s*showAxis\s*=\s*\{true\}/, '');
               } else {
                 if (/testId\s*=/.test(newCode)) {
                   newCode = newCode.replace(
                     /([ \t]*)(testId\s*=)/,
-                    `$1showAxes={true}\n$1$2`,
+                    `$1showAxis={true}\n$1$2`,
                   );
                 } else {
-                  newCode = newCode.replace(/\/>/, `  showAxes={true}\n/>`);
+                  newCode = newCode.replace(/\/>/, `  showAxis={true}\n/>`);
                 }
               }
               updateCode(newCode);

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/vite-env.d.ts

@@ -1 +1,13 @@
 /// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_BACKEND_URL?: string;
+  readonly VITE_API_URL?: string;
+  readonly VITE_DEPLOY_NAME?: string;
+  readonly VITE_AGENT_ID?: string;
+  readonly VITE_AGENT_BASE_URL?: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/schematics",
-  "version": "0.0.71",
+  "version": "0.0.72",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@schematics)",
   "main": "dist/index.js",
   "files": [

package/dist/lib/application/files/gadmin2-game-angle-demo/web/.npmrc

@@ -1 +0,0 @@
-legacy-peer-deps=true

package/src/lib/application/application.schema.d.ts

@@ -1,59 +0,0 @@
-export interface ApplicationOptions {
-  /**
-   * Gadmin application name.
-   */
-  name: string;
-  /**
-   * Gadmin application author.
-   */
-  author?: string;
-  /**
-   * Gadmin application description.
-   */
-  description?: string;
-  /**
-   * Gadmin application destination directory.
-   */
-  directory?: string;
-  /**
-   * With TypeScript strict mode.
-   */
-  strict?: boolean;
-  /**
-   * Gadmin application version.
-   */
-  version?: string;
-  /**
-   * Gadmin application template.
-   */
-  template: string;
-
-  /**
-   * Server framework.
-   */
-  serverFramework: 'gadmin2-game-angle-demo' | 'customize';
-  /**
-   * Transfer protocol.
-   */
-  transferProtocol: 'restful' | 'graphql';
-  /**
-   * With web.
-   */
-  withWeb: boolean;
-  /**
-   * UI framework.
-   */
-  uiFramework?: 'tea' | 'antd';
-  /**
-   * The used package manager.
-   */
-  packageManager?: 'npm' | 'yarn' | 'pnpm' | 'undefined';
-  /**
-   * Gadmin included production dependencies (comma separated values).
-   */
-  dependencies?: string;
-  /**
-   * Gadmin included development dependencies (comma separated values).
-   */
-  devDependencies?: string;
-}

package/src/lib/application/files/gadmin2-game-angle-demo/.dockerignore

@@ -1,33 +0,0 @@
-.DS_Store
-web/
-**/node_modules
-**/dist
-**/generated
-**/bin
-**/build
-**/upload
-.git
-npm-debug.log
-.coverage
-.coverage.*
-.aws
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-
-run.cmd
-todo.md

package/src/lib/application/files/gadmin2-game-angle-demo/.gitignore

@@ -1,46 +0,0 @@
-# compiled output
-bin/
-dist/
-node_modules/
-generated/
-build/
-server/prisma/dbml
-server/prisma/schema.prisma
-upload/
-# Logs
-logs/
-*.log
-npm-debug.log*
-pnpm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-.env.local
-
-# OS
-.DS_Store
-
-# Tests
-coverage
-.nyc_output
-
-# IDEs and editors
-.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-.yalc/
-
-nginx-external-page/
-settings.local.json

package/src/lib/application/files/gadmin2-game-angle-demo/.husky/_/.gitignore

@@ -1 +0,0 @@
-*

package/src/lib/application/files/gadmin2-game-angle-demo/.husky/_/husky.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env sh
-if [ -z "$husky_skip_init" ]; then
-  debug () {
-    if [ "$HUSKY_DEBUG" = "1" ]; then
-      echo "husky (debug) - $1"
-    fi
-  }
-
-  readonly hook_name="$(basename -- "$0")"
-  debug "starting $hook_name..."
-
-  if [ "$HUSKY" = "0" ]; then
-    debug "HUSKY env variable is set to 0, skipping hook"
-    exit 0
-  fi
-
-  if [ -f ~/.huskyrc ]; then
-    debug "sourcing ~/.huskyrc"
-    . ~/.huskyrc
-  fi
-
-  readonly husky_skip_init=1
-  export husky_skip_init
-  sh -e "$0" "$@"
-  exitCode="$?"
-
-  if [ $exitCode != 0 ]; then
-    echo "husky - $hook_name hook exited with code $exitCode (error)"
-  fi
-
-  if [ $exitCode = 127 ]; then
-    echo "husky - command not found in PATH=$PATH"
-  fi
-
-  exit $exitCode
-fi

package/src/lib/application/files/gadmin2-game-angle-demo/.husky/pre-commit

@@ -1,10 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-# Format staged files in web
-cd web && npx lint-staged
-cd ..
-
-# Format staged files in server
-cd server && npx lint-staged
-cd ..

package/src/lib/application/files/gadmin2-game-angle-demo/Dockerfile

@@ -1,63 +0,0 @@
-# syntax=docker/dockerfile:1
-
-# ─── 阶段 1：构建 ────────────────────────────────────────────
-FROM node:20-alpine AS builder
-
-WORKDIR /app
-
-# 禁止 husky 在无 .git 环境下报错
-ENV HUSKY=0
-
-# 安装 gadmin2 CLI（建议锁定版本号以保证构建可复现）
-RUN yarn global add @gadmin2n/cli@0.0.80
-
-# 先复制依赖描述文件，源码未变时此层可复用缓存
-COPY server/package.json server/yarn.lock ./server/
-
-# 安装全量依赖（含 devDependencies，用于代码生成和 TypeScript 编译）
-RUN --mount=type=cache,target=/root/.yarn \
-    cd server && yarn install --frozen-lockfile
-
-# 复制 Prisma schema 配置和所有源码
-COPY config/ ./config/
-COPY server/ ./server/
-
-# 代码生成 + 编译
-RUN gadmin2 g prisma:server && cd server && yarn build
-
-# ─── 阶段 2：运行 ────────────────────────────────────────────
-FROM node:20-alpine AS runner
-
-WORKDIR /app/server
-
-STOPSIGNAL SIGQUIT
-
-# 禁止 husky 在无 .git 环境下报错
-ENV HUSKY=0
-
-# 先复制依赖描述文件
-COPY server/package.json server/yarn.lock ./
-
-# 只安装 production 依赖，大幅减少镜像体积
-RUN --mount=type=cache,target=/root/.yarn \
-    yarn install --production --frozen-lockfile
-
-# 从构建阶段复制 Prisma 生成的 Client（含平台原生二进制）
-COPY --from=builder /app/server/node_modules/.prisma ./node_modules/.prisma
-
-# 从构建阶段复制编译产物
-COPY --from=builder /app/server/dist ./dist
-
-# 复制 Prisma schema（feature 分支部署时 prisma db push 需要）
-COPY --from=builder /app/server/prisma ./prisma
-
-# 复制启动脚本和数据库迁移脚本
-COPY server/start-prod.sh server/migrate-between-pg-schemas.js ./
-RUN chmod +x start-prod.sh
-
-# 复制环境变量配置（作为默认值，K8s 注入的同名变量优先级更高）
-COPY server/.env ./.env
-
-EXPOSE 8000
-
-CMD ["yarn", "start:prod"]

package/src/lib/application/files/gadmin2-game-angle-demo/Jenkinsfile

@@ -1,70 +0,0 @@
-// see https://www.jenkins.io/doc/book/pipeline/syntax/
-pipeline {
-  agent any
-  environment {
-    CODING_DOCKER_REG_HOST = "${CCI_CURRENT_TEAM}-${CCI_DOCKER_REGISTRY_DOMAIN}"
-    IMAGE_VERSION = "build-${env.CI_BUILD_NUMBER}"
-    CODING_DOCKER_IMAGE_NAME = "${PROJECT_NAME.toLowerCase()}/${env.BRANCH_NAME == 'test'? 'test' : 'prod'}/${CCI_JOB_NAME}"
-    IMAGE_FULL_NAME = "${CODING_DOCKER_REG_HOST}/${env.CODING_DOCKER_IMAGE_NAME}:${IMAGE_VERSION}"
-  }
-
-  stages {
-    stage('检出Git') {
-      when {
-        anyOf {
-          branch 'test';
-          branch 'master'
-        }
-      }
-      steps {
-        checkout([$class: 'GitSCM', branches: [[name: env.GIT_BUILD_REF]], userRemoteConfigs: [[url: env.GIT_REPO_URL, credentialsId: env.CREDENTIALS_ID]]])
-      }
-    }
-
-    stage('构建推送镜像') {
-      when {
-        anyOf {
-          branch 'test';
-          branch 'master'
-        }
-      }
-      steps {
-        script {
-          docker.withRegistry(
-            "${CCI_CURRENT_WEB_PROTOCOL}://${env.CODING_DOCKER_REG_HOST}",
-            "${env.CODING_ARTIFACTS_CREDENTIALS_ID}"
-          ) {
-            docker.build("${env.CODING_DOCKER_IMAGE_NAME}:${IMAGE_VERSION}").push()
-            sh "docker image rm ${env.IMAGE_FULL_NAME}"
-          }
-        }
-      }
-    }
-
-    stage('测试环境部署') {
-      when {
-        anyOf {
-          branch 'test'
-        }
-      }
-      steps {
-        sh 'curl https://api-spinnaker.devops.intlgame.com/webhooks/webhook/oit-erp-backend-test -X POST -H "content-type: application/json" -d \'{"parameters": {"image_tag": "\'"${IMAGE_VERSION}"\'"}}\''
-        echo '部署已经触发，可以在Spinnaker查看状态: https://api-spinnaker.devops.intlgame.com'
-      }
-    }
-
-    stage('正式环境自动部署') {
-      when {
-        anyOf {
-          branch 'master'
-        }
-      }
-      steps {
-        script {
-          sh 'curl https://api-spinnaker.devops.intlgame.com/webhooks/webhook/oit-erp-backend-prod -X POST -H "content-type: application/json" -d \'{"parameters": {"image_tag": "\'"${IMAGE_VERSION}"\'"}}\''
-          echo '部署已经触发，可以在Spinnaker查看状态: https://api-spinnaker.devops.intlgame.com'
-        }
-      }
-    }
-  }
-}