feat: Refactor template handling and brand management

- Removed schema_json from article templates and related queries.
- Updated brand service to include website field in requests and responses.
- Simplified template wizard view by eliminating unused schema fields and related logic.
- Added tests for ark text format handling.
- Created migrations for dropping schema_json and adding website to brands.

apps/admin-web/src/i18n/messages/en-US.ts

@@ -447,6 +447,7 @@ const enUS = {
     },
     form: {
       brandName: "Brand name",
+      brandWebsite: "Company website (optional)",
       brandDescription: "Brand description",
       keywordName: "Keyword",
       questionText: "Question text",

apps/admin-web/src/i18n/messages/zh-CN.ts

@@ -454,6 +454,7 @@ const zhCN = {
     },
     form: {
       brandName: "品牌名称",
+      brandWebsite: "公司官网（选填）",
       brandDescription: "品牌描述",
       keywordName: "关键词名称",
       questionText: "问题内容",

apps/admin-web/src/views/BrandsView.vue

@@ -12,7 +12,6 @@ import type { TableColumnsType } from "ant-design-vue";
 import { computed, reactive, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 
-import PageHero from "@/components/PageHero.vue";
 import { brandsApi } from "@/lib/api";
 import { formatError } from "@/lib/errors";
 
@@ -36,6 +35,7 @@ const editingCompetitorId = ref<number | null>(null);
 
 const brandForm = reactive({
   name: "",
+  website: "",
   description: "",
 });
 
@@ -60,12 +60,6 @@ const brandListQuery = useQuery({
   queryFn: () => brandsApi.list(),
 });
 
-const brandDetailQuery = useQuery({
-  queryKey: computed(() => ["brands", "detail", selectedBrandId.value]),
-  enabled: computed(() => Boolean(selectedBrandId.value)),
-  queryFn: () => brandsApi.detail(selectedBrandId.value as number),
-});
-
 const keywordsQuery = useQuery({
   queryKey: computed(() => ["brands", selectedBrandId.value, "keywords"]),
   enabled: computed(() => Boolean(selectedBrandId.value)),
@@ -101,6 +95,7 @@ const brandMutations = {
     mutationFn: () =>
       brandsApi.create({
         name: brandForm.name.trim(),
+        website: brandForm.website.trim() || null,
         description: brandForm.description.trim() || null,
       }),
     onSuccess: async (brand) => {
@@ -118,6 +113,7 @@ const brandMutations = {
     mutationFn: () =>
       brandsApi.update(editingBrandId.value as number, {
         name: brandForm.name.trim(),
+        website: brandForm.website.trim() || null,
         description: brandForm.description.trim() || null,
       }),
     onSuccess: async () => {
@@ -274,7 +270,6 @@ const competitorMutations = {
   }),
 };
 
-const selectedBrand = computed(() => brandDetailQuery.data.value);
 const selectedKeyword = computed(() =>
   keywordsQuery.data.value?.find((item) => item.id === selectedKeywordId.value) ?? null,
 );
@@ -345,6 +340,7 @@ function stringifyProductLines(value: unknown): string {
 function openBrandModal(brand?: Brand): void {
   editingBrandId.value = brand?.id ?? null;
   brandForm.name = brand?.name ?? "";
+  brandForm.website = brand?.website ?? "";
   brandForm.description = brand?.description ?? "";
   brandModalOpen.value = true;
 }
@@ -439,18 +435,21 @@ async function submitCompetitor(): Promise<void> {
 
 <template>
   <div class="brands-view">
-    <PageHero
-      :eyebrow="t('brands.eyebrow')"
-      :title="t('brands.title')"
-      :description="t('brands.description')"
-    >
-      <template #actions>
-        <a-button type="primary" @click="openBrandModal()">
-          <template #icon><PlusOutlined /></template>
-          {{ t("brands.newBrand") }}
-        </a-button>
-      </template>
-    </PageHero>
+    <section class="brands-view__top-card">
+      <div class="brands-view__header">
+        <div class="brands-view__header-title">
+          <p class="eyebrow" style="margin-bottom: 4px;">{{ t('brands.eyebrow') }}</p>
+          <h2>{{ t('brands.title') }}</h2>
+          <p>{{ t('brands.description') }}</p>
+        </div>
+        <div class="brands-view__header-actions">
+          <a-button type="primary" @click="openBrandModal()">
+            <template #icon><PlusOutlined /></template>
+            {{ t("brands.newBrand") }}
+          </a-button>
+        </div>
+      </div>
+    </section>
 
     <section class="brands-view__brand-rail">
       <div class="brands-view__section-head">
@@ -491,19 +490,7 @@ async function submitCompetitor(): Promise<void> {
       <a-empty v-else :description="t('brands.empty.brands')" />
     </section>
 
-    <template v-if="selectedBrandId && selectedBrand">
-      <section class="brands-view__brand-summary">
-        <div>
-          <p class="eyebrow">{{ t("brands.title") }}</p>
-          <h3>{{ selectedBrand.name }}</h3>
-          <p>{{ selectedBrand.description || "--" }}</p>
-        </div>
-        <div class="brands-view__brand-summary-actions">
-          <a-button @click="openBrandModal(selectedBrand)">{{ t("brands.editBrand") }}</a-button>
-          <a-button @click="activeTab = 'competitors'">{{ t("brands.tabs.competitors") }}</a-button>
-        </div>
-      </section>
-
+    <template v-if="selectedBrandId">
       <a-tabs v-model:activeKey="activeTab" class="brands-view__tabs">
         <a-tab-pane key="keywords" :tab="t('brands.tabs.keywords')">
           <section class="brands-view__keyword-layout">
@@ -660,6 +647,9 @@ async function submitCompetitor(): Promise<void> {
         <a-form-item :label="t('brands.form.brandName')">
           <a-input v-model:value="brandForm.name" />
         </a-form-item>
+        <a-form-item :label="t('brands.form.brandWebsite')">
+          <a-input v-model:value="brandForm.website" />
+        </a-form-item>
         <a-form-item :label="t('brands.form.brandDescription')">
           <a-textarea v-model:value="brandForm.description" :rows="4" />
         </a-form-item>
@@ -745,15 +735,47 @@ async function submitCompetitor(): Promise<void> {
   gap: 22px;
 }
 
+.brands-view__top-card,
 .brands-view__brand-rail,
-.brands-view__brand-summary,
 .brands-view__keywords-panel,
 .brands-view__questions-panel,
 .brands-view__competitors-panel {
   padding: 24px;
   background: #fff;
   border: 1px solid #e6edf5;
-  border-radius: 24px;
+  border-radius: 12px;
+  overflow: hidden;
+}
+
+.brands-view__top-card {
+  padding: 0;
+}
+
+.brands-view__header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 24px;
+}
+
+.brands-view__header-title h2 {
+  margin: 0;
+  font-size: 20px;
+  font-weight: 600;
+  color: #1a1a1a;
+  line-height: 1.4;
+}
+
+.brands-view__header-title p {
+  margin: 6px 0 0 0;
+  font-size: 13px;
+  color: #8c8c8c;
+}
+
+.brands-view__header-actions {
+  display: flex;
+  gap: 12px;
+  margin-left: auto; /* explicit push to right just in case */
 }
 
 .brands-view__section-head {
@@ -764,13 +786,31 @@ async function submitCompetitor(): Promise<void> {
   margin-bottom: 18px;
 }
 
-.brands-view__section-head--compact h3 {
-  font-size: 20px;
-}
-
 .brands-view__section-head h3 {
   margin: 6px 0 0;
-  font-size: 24px;
+  font-size: 20px;
+  font-weight: 800;
+  color: #111827;
+  display: flex;
+  align-items: center;
+}
+
+.brands-view__section-head h3::before {
+  content: "";
+  display: inline-block;
+  width: 4px;
+  height: 18px;
+  border-radius: 2px;
+  background: #111827;
+  margin-right: 12px;
+}
+
+.brands-view__section-head--compact h3 {
+  font-size: 18px;
+}
+
+.brands-view__section-head--compact h3::before {
+  height: 16px;
 }
 
 .brands-view__brand-grid {
@@ -784,14 +824,37 @@ async function submitCompetitor(): Promise<void> {
   flex-direction: column;
   gap: 14px;
   padding: 18px;
-  background: #f8fafc;
+  background: #fff;
   border: 1px solid #e6edf5;
-  border-radius: 20px;
+  border-radius: 12px;
   cursor: pointer;
+  transition: transform 0.2s, box-shadow 0.2s;
+}
+
+.brands-view__brand-card:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 12px 24px rgba(0,0,0,0.06);
+}
+
+.brands-view__brand-card-actions,
+.brands-view__keyword-actions,
+.brands-view__competitor-head .brands-view__inline-actions {
+  opacity: 0;
+  transition: opacity 0.2s ease;
+}
+
+.brands-view__brand-card:hover .brands-view__brand-card-actions,
+.brands-view__brand-card:focus-within .brands-view__brand-card-actions,
+.brands-view__keyword-item:hover .brands-view__keyword-actions,
+.brands-view__keyword-item:focus-within .brands-view__keyword-actions,
+.brands-view__competitor-card:hover .brands-view__competitor-head .brands-view__inline-actions,
+.brands-view__competitor-card:focus-within .brands-view__competitor-head .brands-view__inline-actions {
+  opacity: 1;
 }
 
 .brands-view__brand-card--active {
   border-color: #bfd7ff;
+  background: #f0f7ff;
   box-shadow: 0 18px 40px rgba(31, 92, 255, 0.08);
 }
 
@@ -802,13 +865,11 @@ async function submitCompetitor(): Promise<void> {
 }
 
 .brands-view__brand-card h4,
-.brands-view__brand-summary h3,
 .brands-view__competitor-card h4 {
   margin: 0;
 }
 
 .brands-view__brand-card p,
-.brands-view__brand-summary p,
 .brands-view__competitor-card p {
   margin: 8px 0 0;
   color: var(--muted);
@@ -816,19 +877,12 @@ async function submitCompetitor(): Promise<void> {
 }
 
 .brands-view__brand-card-actions,
-.brands-view__inline-actions,
 .brands-view__keyword-actions,
-.brands-view__brand-summary-actions {
+.brands-view__inline-actions {
   display: flex;
   gap: 8px;
 }
 
-.brands-view__brand-summary {
-  display: flex;
-  justify-content: space-between;
-  gap: 24px;
-}
-
 .brands-view__keyword-layout {
   display: grid;
   grid-template-columns: 320px minmax(0, 1fr);
@@ -847,11 +901,17 @@ async function submitCompetitor(): Promise<void> {
   justify-content: space-between;
   gap: 12px;
   padding: 14px 16px;
-  background: #f8fafc;
+  background: #fff;
   border: 1px solid #e6edf5;
-  border-radius: 18px;
+  border-radius: 12px;
   cursor: pointer;
   text-align: left;
+  transition: all 0.2s;
+}
+
+.brands-view__keyword-item:hover {
+  border-color: #bfd7ff;
+  background: #f0f7ff;
 }
 
 .brands-view__keyword-item--active {
@@ -878,9 +938,15 @@ async function submitCompetitor(): Promise<void> {
 
 .brands-view__competitor-card {
   padding: 18px;
-  background: #f8fafc;
+  background: #fff;
   border: 1px solid #e6edf5;
-  border-radius: 20px;
+  border-radius: 12px;
+  transition: transform 0.2s, box-shadow 0.2s;
+}
+
+.brands-view__competitor-card:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 12px 24px rgba(0,0,0,0.06);
 }
 
 .brands-view__competitor-head {
@@ -928,7 +994,6 @@ async function submitCompetitor(): Promise<void> {
 }
 
 @media (max-width: 720px) {
-  .brands-view__brand-summary,
   .brands-view__section-head {
     flex-direction: column;
     align-items: stretch;

apps/admin-web/src/views/TemplateWizardView.vue

@@ -14,9 +14,8 @@ import type {
   TemplateAssistCompetitor,
   TemplateAnalyzeResult,
   TemplateOutlineNode,
-  TemplateSchemaField,
 } from "@geo/shared-types";
-import { computed, reactive, ref, watch } from "vue";
+import { computed, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
 
@@ -154,7 +153,6 @@ let outlineNodeSeed = 0;
 
 const currentStep = ref(0);
 const articleLocale = ref("zh-CN");
-const fieldValues = reactive<Record<string, JsonValue>>({});
 const currentArticleId = ref<number | null>(null);
 const restoringDraft = ref(false);
 const savingDraft = ref(false);
@@ -259,7 +257,6 @@ const templateCardConfig = computed<TemplateCardConfig>(() =>
 );
 const wizardConfig = computed<TemplateWizardConfig | null>(() => templateCardConfig.value.wizard ?? null);
 const isResearchReportTemplate = computed(() => templateDetail.value?.template_key === "research_report");
-const wizardManagedFields = computed(() => wizardConfig.value?.managed_fields ?? []);
 const templateMeta = computed(() => {
   const fallback = getTemplateMeta(templateDetail.value?.template_key ?? "unknown");
   return {
@@ -272,20 +269,6 @@ const selectedBrand = computed(() =>
   brandsQuery.data.value?.find((brand) => brand.id === selectedBrandId.value) ?? null,
 );
 
-const schemaFields = computed<TemplateSchemaField[]>(() => {
-  return templateDetailQuery.data.value?.schema_json?.fields ?? [];
-});
-
-const visibleSchemaFields = computed(() =>
-  schemaFields.value.filter((field) =>
-    !isWizardManagedField(
-      field.name,
-      templateDetail.value?.template_key,
-      wizardManagedFields.value,
-    ),
-  ),
-);
-
 const keywordOptions = computed(() =>
   (keywordsQuery.data.value ?? []).map((item) => ({
     label: item.name,
@@ -378,17 +361,7 @@ const structureStepCopy = computed<TemplateStepConfig>(() => wizardConfig.value?
 const generateStepCopy = computed<TemplateStepConfig>(() => wizardConfig.value?.steps?.generate ?? {});
 const brandCardCopy = computed<TemplateCardCopy>(() => wizardConfig.value?.basic?.cards?.brand ?? {});
 const keywordCardCopy = computed<TemplateCardCopy>(() => wizardConfig.value?.basic?.cards?.keywords ?? {});
-const fieldsCardCopy = computed<TemplateCardCopy>(() => wizardConfig.value?.basic?.cards?.template_fields ?? {});
 const competitorsCardCopy = computed<TemplateCardCopy>(() => wizardConfig.value?.basic?.cards?.competitors ?? {});
-const hasTemplateFieldsCardConfig = computed(
-  () => !isResearchReportTemplate.value && Boolean(wizardConfig.value?.basic?.cards?.template_fields),
-);
-const editableSchemaFields = computed<TemplateSchemaField[]>(() =>
-  hasTemplateFieldsCardConfig.value ? visibleSchemaFields.value : [],
-);
-const showTemplateFieldsCard = computed(
-  () => editableSchemaFields.value.length > 0 && fieldsCardCopy.value.visible !== false,
-);
 const titleCardCopy = computed<TemplateCardCopy>(() => wizardConfig.value?.structure?.cards?.choose_title ?? {});
 const outlineCardCopy = computed<TemplateCardCopy>(() => wizardConfig.value?.structure?.cards?.outline ?? {});
 const previewCardCopy = computed<TemplateCardCopy>(() => wizardConfig.value?.structure?.cards?.preview ?? {});
@@ -436,7 +409,7 @@ const assistHeading = computed(() =>
       : t("templates.wizard.assist.outlineTitle"),
 );
 
-function resetWizardState(fields: TemplateSchemaField[], detail: NonNullable<typeof templateDetail.value>): void {
+function resetWizardState(detail: NonNullable<typeof templateDetail.value>): void {
   currentArticleId.value = draftArticleId.value;
   currentStep.value = 0;
   articleLocale.value = "zh-CN";
@@ -455,20 +428,6 @@ function resetWizardState(fields: TemplateSchemaField[], detail: NonNullable<typ
   customOutlineInput.value = "";
   generatedOutline.value = [];
 
-  for (const key of Object.keys(fieldValues)) {
-    delete fieldValues[key];
-  }
-
-  for (const field of fields) {
-    if (field.default !== undefined) {
-      fieldValues[field.name] = field.default;
-    } else if (field.type === "number") {
-      fieldValues[field.name] = null;
-    } else {
-      fieldValues[field.name] = "";
-    }
-  }
-
   const defaults = buildOutlineOptions(
     templateCardConfig.value.wizard?.outline,
     detail.template_key,
@@ -527,26 +486,17 @@ function applyDraftArticleState(detail: ArticleDetail): void {
   outlineSections.value = stringListFromUnknown(draftState.outline_sections) ?? outlineSections.value;
   generatedOutline.value = decorateOutlineNodes(parseOutlineNodes(draftState.generated_outline));
 
-  const savedFields = asRecord(draftState.field_values);
-  if (savedFields) {
-    for (const field of schemaFields.value) {
-      if (Object.prototype.hasOwnProperty.call(savedFields, field.name)) {
-        fieldValues[field.name] = savedFields[field.name] as JsonValue;
-      }
-    }
-  }
-
   restoringDraft.value = false;
 }
 
 watch(
-  [enabled, schemaFields, templateDetail, () => draftArticleQuery.data.value],
-  ([isOpen, fields, detail, draftArticle]) => {
+  [enabled, templateDetail, () => draftArticleQuery.data.value],
+  ([isOpen, detail, draftArticle]) => {
     if (!isOpen || !detail) {
       return;
     }
 
-    resetWizardState(fields, detail);
+    resetWizardState(detail);
     if (draftArticle && (draftArticle.generate_status === "draft" || draftArticle.generate_status === "failed")) {
       applyDraftArticleState(draftArticle);
     }
@@ -599,6 +549,9 @@ watch(selectedBrandId, async (brandId) => {
   if (brand && !brandName.value.trim()) {
     brandName.value = brand.name;
   }
+  if (brand?.website && !officialWebsite.value.trim()) {
+    officialWebsite.value = brand.website;
+  }
   if (brand?.description && !brandSummary.value.trim()) {
     brandSummary.value = brand.description;
   }
@@ -633,37 +586,12 @@ function nextOutlineNodeKey(): string {
   return `outline-${outlineNodeSeed}`;
 }
 
-function isWizardManagedField(name: string, templateKey?: string, managedFields: string[] = []): boolean {
-  if (managedFields.includes(name)) {
-    return true;
-  }
-  if (name === "count" || name === "brand" || name === "keyword") {
-    return true;
-  }
-  if (templateKey === "top_x_article" && name === "topic") {
-    return true;
-  }
-  return false;
-}
-
-function renderFieldPlaceholder(field: TemplateSchemaField): string {
-  return field.placeholder || `${t("common.inputPlease")}${field.label}`;
-}
-
 function validateBasicInfo(): boolean {
   if (!normalizedBrandName.value) {
     message.warning(t("templates.wizard.messages.missingBrand"));
     return false;
   }
 
-  for (const field of editableSchemaFields.value) {
-    const value = fieldValues[field.name];
-    if (field.required && (value === null || value === "" || value === undefined)) {
-      message.warning(t("templates.wizard.messages.requiredField", { field: field.label }));
-      return false;
-    }
-  }
-
   return true;
 }
 
@@ -992,6 +920,7 @@ async function ensureBrandForLibrary(): Promise<number> {
 
   const created = await brandsApi.create({
     name: normalizedBrandName.value,
+    website: officialWebsite.value.trim() || null,
     description: brandSummary.value.trim() || null,
   });
   selectedBrandId.value = created.id;
@@ -1015,13 +944,6 @@ function buildCompetitorPayload(): TemplateAssistCompetitor[] {
 
 function buildAssistInputParams(): Record<string, JsonValue> {
   const payload: Record<string, JsonValue> = {};
-  for (const field of schemaFields.value) {
-    const value = fieldValues[field.name];
-    if (value !== null && value !== "" && value !== undefined) {
-      payload[field.name] = value;
-    }
-  }
-
   const derivedInputs = wizardConfig.value?.derived_inputs ?? {};
   for (const [key, config] of Object.entries(derivedInputs)) {
     const value = resolveDerivedInputValue(key, config);
@@ -1052,7 +974,6 @@ function buildPayload(): Record<string, JsonValue> {
         }))
       : undefined;
   const payload: Record<string, JsonValue | undefined> = {
-    ...fieldValues,
     locale: articleLocale.value,
     title: finalTitle.value || undefined,
     outline_sections: selectedOutlineLabels.value,
@@ -1080,20 +1001,6 @@ function buildPayload(): Record<string, JsonValue> {
         payload[key] = derivedValue;
       }
     }
-  } else {
-    const competitorCount = competitorPayload.length;
-    if (hasSchemaField("brand")) {
-      payload.brand = normalizedBrandName.value;
-    }
-    if (hasSchemaField("keyword") && primaryKeyword.value) {
-      payload.keyword = primaryKeyword.value;
-    }
-    if (hasSchemaField("topic") && !stringValue(fieldValues.topic)) {
-      payload.topic = primaryKeyword.value || normalizedBrandName.value;
-    }
-    if (hasSchemaField("count")) {
-      payload.count = competitorCount > 0 ? competitorCount : defaultFieldNumber("count", 5);
-    }
   }
 
   return Object.fromEntries(
@@ -1105,7 +1012,6 @@ function buildDraftState(): Record<string, JsonValue> {
   return {
     current_step: currentStep.value,
     locale: articleLocale.value,
-    field_values: { ...fieldValues },
     selected_brand_id: selectedBrandId.value,
     brand_name: brandName.value.trim(),
     official_website: officialWebsite.value.trim(),
@@ -1138,23 +1044,6 @@ function buildDraftState(): Record<string, JsonValue> {
   };
 }
 
-function hasSchemaField(name: string): boolean {
-  return schemaFields.value.some((field) => field.name === name);
-}
-
-function defaultFieldNumber(name: string, fallback: number): number {
-  const field = schemaFields.value.find((item) => item.name === name);
-  if (!field) {
-    return fallback;
-  }
-  const numeric = Number(field.default);
-  return Number.isFinite(numeric) && numeric > 0 ? numeric : fallback;
-}
-
-function stringValue(value: JsonValue | undefined): string {
-  return typeof value === "string" ? value.trim() : "";
-}
-
 function handleGenerate(): void {
   if (!validateBasicInfo() || !validateStructure() || !validateGeneratedOutline()) {
     return;
@@ -1814,7 +1703,7 @@ function resolveDerivedInputValue(
       if (typeof config.fallback_number === "number") {
         return config.fallback_number;
       }
-      return hasSchemaField(fieldName) ? defaultFieldNumber(fieldName, 0) || undefined : undefined;
+      return undefined;
     }
     default:
       return undefined;
@@ -2207,48 +2096,6 @@ function onStructureDragEnd(): void {
             />
           </div>
 
-          <div v-if="showTemplateFieldsCard" class="wizard-card">
-            <div class="wizard-card__header">
-              <div>
-                <h3>{{ fieldsCardCopy.title || t("templates.wizard.sections.templateFields") }}</h3>
-                <p>{{ fieldsCardCopy.hint || t("templates.wizard.hints.templateFields") }}</p>
-              </div>
-            </div>
-
-            <div class="field-grid">
-              <div v-for="field in editableSchemaFields" :key="field.name" class="field-item">
-                <label :class="{ 'required-asterisk': field.required }">{{ field.label }}</label>
-                <a-input
-                  v-if="field.type === 'text'"
-                  v-model:value="fieldValues[field.name]"
-                  :placeholder="renderFieldPlaceholder(field)"
-                />
-                <a-input-number
-                  v-else-if="field.type === 'number'"
-                  v-model:value="fieldValues[field.name]"
-                  :placeholder="renderFieldPlaceholder(field)"
-                  style="width: 100%"
-                  :min="1"
-                />
-                <a-select
-                  v-else-if="field.type === 'select'"
-                  v-model:value="fieldValues[field.name]"
-                  :options="(field.options || []).map((option) =>
-                    typeof option === 'object'
-                      ? option
-                      : { label: String(option), value: option }
-                  )"
-                  :placeholder="renderFieldPlaceholder(field)"
-                />
-                <a-input
-                  v-else
-                  v-model:value="fieldValues[field.name]"
-                  :placeholder="renderFieldPlaceholder(field)"
-                />
-              </div>
-            </div>
-          </div>
-
           <div v-if="showCompetitorsCard" class="wizard-card">
             <div class="wizard-card__header">
               <div>