前端优化 bug

杨鑫
1 parent e76e1ab9
Showing 18 changed files with 443 additions and 212 deletions
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-app-auth.ts
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-multi-tenancy.ts
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-tenant-provisioning.ts
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-web-auth.ts
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/store/th-tenant.ts
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/authentication/login.vue
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/data.ts
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/index.vue
泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-modal.vue
美国版/Food Labeling Management App UniApp/src/utils/appAdminRole.ts
美国版/Food Labeling Management Platform/src/components/labels/LabelCategoriesView.tsx
美国版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/LabelCanvas.tsx
美国版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/PropertiesPanel.tsx
美国版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/index.tsx
美国版/Food Labeling Management Platform/src/components/locations/LocationsView.tsx
美国版/Food Labeling Management Platform/src/components/people/PeopleView.tsx
美国版/Food Labeling Management Platform/src/components/products/ProductsView.tsx
美国版/Food Labeling Management Platform/src/types/labelCategory.ts
+export interface ThAppBoundLocationDto {
+  id: string;
+  locationCode: string;
+  locationName: string;
+  fullAddress: string;
+  state: boolean;
+}
+
+export interface ThAppLoginInput {
+  tenantId: string;
+  email: string;
+  password: string;
+  uuid?: string;
+  code?: string;
+}
+
+export interface ThAppLoginOutputDto {
+  token: string;
+  refreshToken: string;
+  tenantId: string;
+  tenantName: string;
+  locations: ThAppBoundLocationDto[];
+}
+
+function normalizeLocation(raw: Record<string, unknown>): ThAppBoundLocationDto {
+  return {
+    id: String(raw.id ?? raw.Id ?? ''),
+    locationCode: String(raw.locationCode ?? raw.LocationCode ?? ''),
+    locationName: String(raw.locationName ?? raw.LocationName ?? ''),
+    fullAddress: String(raw.fullAddress ?? raw.FullAddress ?? ''),
+    state: raw.state !== false && raw.State !== false,
+  };
+}
+
+function normalizeAppLoginOutput(raw: unknown): ThAppLoginOutputDto {
+  const o =
+    raw && typeof raw === 'object' ? (raw as Record<string, unknown>) : {};
+  const locs = o.locations ?? o.Locations;
+  const arr = Array.isArray(locs) ? locs : [];
+  return {
+    token: String(o.token ?? o.Token ?? ''),
+    refreshToken: String(o.refreshToken ?? o.RefreshToken ?? ''),
+    tenantId: String(o.tenantId ?? o.TenantId ?? ''),
+    tenantName: String(o.tenantName ?? o.TenantName ?? ''),
+    locations: arr.map((x) => normalizeLocation(x as Record<string, unknown>)),
+  };
+}
+
+function normalizeLocationList(raw: unknown): ThAppBoundLocationDto[] {
+  const arr = Array.isArray(raw) ? raw : [];
+  return arr.map((x) => normalizeLocation(x as Record<string, unknown>));
+}
+
+/** POST /api/app/th-app-auth/login */
+export async function thAppLogin(
+  input: ThAppLoginInput,
+): Promise<ThAppLoginOutputDto> {
+  const { requestClient } = await import('#/api/request');
+  const raw = await requestClient.post<unknown>(
+    'th-app-auth/login',
+    {
+      tenantId: input.tenantId,
+      email: input.email.trim(),
+      password: input.password,
+      ...(input.uuid ? { uuid: input.uuid } : {}),
+      ...(input.code != null && input.code !== '' ? { code: input.code } : {}),
+    },
+    {
+      errorMessageMode: 'none',
+      headers: {
+        __tenant: input.tenantId,
+      },
+      successMessageMode: 'none',
+    },
+  );
+  return normalizeAppLoginOutput(raw);
+}
+
+/** GET /api/app/th-app-auth/my-locations */
+export async function thAppMyLocations(): Promise<ThAppBoundLocationDto[]> {
+  const { requestClient } = await import('#/api/request');
+  const raw = await requestClient.get<unknown>('th-app-auth/my-locations');
+  return normalizeLocationList(raw);
+}
+import { requestClient } from '#/api/request';
+
+export interface ThTenantSelectDto {
+  id: string;
+  name: string;
+}
+
+export interface ThCurrentTenantDto {
+  tenantId: string | null;
+  tenantName: string | null;
+}
+
+function normalizeTenantSelectItem(
+  raw: Record<string, unknown>,
+): ThTenantSelectDto {
+  return {
+    id: String(raw.id ?? raw.Id ?? ''),
+    name: String(raw.name ?? raw.Name ?? ''),
+  };
+}
+
+function normalizeTenantSelectList(raw: unknown): ThTenantSelectDto[] {
+  const arr = Array.isArray(raw) ? raw : [];
+  return arr.map((x) =>
+    normalizeTenantSelectItem(x as Record<string, unknown>),
+  );
+}
+
+function normalizeCurrentTenant(raw: unknown): ThCurrentTenantDto {
+  const o =
+    raw && typeof raw === 'object' ? (raw as Record<string, unknown>) : {};
+  const tenantId = o.tenantId ?? o.TenantId;
+  const tenantName = o.tenantName ?? o.TenantName;
+  return {
+    tenantId: tenantId == null ? null : String(tenantId),
+    tenantName: tenantName == null ? null : String(tenantName),
+  };
+}
+
+/** GET /api/app/th-multi-tenancy/tenant-select */
+export async function thTenantSelectList(): Promise<ThTenantSelectDto[]> {
+  const raw = await requestClient.get<unknown>(
+    'th-multi-tenancy/tenant-select',
+    {
+      errorMessageMode: 'none',
+      successMessageMode: 'none',
+    },
+  );
+  return normalizeTenantSelectList(raw);
+}
+
+/** GET /api/app/th-multi-tenancy/current-tenant */
+export async function thCurrentTenant(): Promise<ThCurrentTenantDto> {
+  const raw = await requestClient.get<unknown>(
+    'th-multi-tenancy/current-tenant',
+    {
+      errorMessageMode: 'none',
+      successMessageMode: 'none',
+    },
+  );
+  return normalizeCurrentTenant(raw);
+}
@@ -15,6 +15,10 @@ export interface ThProvisionTenantOutputDto {
   databaseInitialized: boolean;
 }
+export interface ThInitializeTenantDatabaseInput {
+  tenantId: string;
+}
+
 function normalizeProvisionTenantOutput(
   raw: unknown,
 ): ThProvisionTenantOutputDto {
@@ -50,3 +54,19 @@ export async function thProvisionTenant(
   );
   return normalizeProvisionTenantOutput(raw);
 }
+
+/** POST /api/app/th-tenant-provisioning/initialize-tenant-database */
+export async function thInitializeTenantDatabase(
+  input: ThInitializeTenantDatabaseInput,
+) {
+  return requestClient.post<void>(
+    'th-tenant-provisioning/initialize-tenant-database',
+    null,
+    {
+      params: {
+        tenantId: input.tenantId,
+      },
+      successMessageMode: 'message',
+    },
+  );
+}
@@ -18,8 +18,9 @@ let loginInFlight: Promise&lt;ThWebLoginOutputDto&gt; | null = null;
 function normalizeWebLoginOutput(raw: unknown): ThWebLoginOutputDto {
   const o =
     raw && typeof raw === 'object' ? (raw as Record<string, unknown>) : {};
+  const token = String(o.token ?? o.Token ?? '').trim();
   return {
-    token: String(o.token ?? o.Token ?? ''),
+    token: token.replace(/^Bearer\s+/i, ''),
     refreshToken: String(o.refreshToken ?? o.RefreshToken ?? ''),
     tenantId: String(o.tenantId ?? o.TenantId ?? ''),
     tenantName: String(o.tenantName ?? o.TenantName ?? ''),
+import type { ThAppBoundLocationDto } from '#/api/th';
+
+import { defineStore } from 'pinia';
+
+export interface ThTenantContext {
+  tenantId: string;
+  tenantName: string;
+  locations: ThAppBoundLocationDto[];
+}
+
+export const useThTenantStore = defineStore('th-tenant', {
+  actions: {
+    setTenantContext(ctx: Partial<ThTenantContext>) {
+      if (ctx.tenantId != null) {
+        this.tenantId = ctx.tenantId;
+      }
+      if (ctx.tenantName != null) {
+        this.tenantName = ctx.tenantName;
+      }
+      if (ctx.locations != null) {
+        this.locations = ctx.locations;
+      }
+    },
+  },
+  persist: {
+    pick: ['tenantId', 'tenantName', 'locations'],
+  },
+  state: (): ThTenantContext => ({
+    tenantId: '',
+    tenantName: '',
+    locations: [],
+  }),
+});
@@ -34,6 +34,7 @@ const captchaInfo = ref&lt;CaptchaResponse&gt;({
 const captchaLoading = ref(false);
 const tenantOptions = ref<ThTenantSelectDto[]>([]);
 const loginSubmitting = ref(false);
+const LAST_TENANT_KEY = 'th:last-tenant-id';
 async function loadCaptcha() {
   try {
@@ -54,9 +55,13 @@ async function loadTenant() {
   try {
     const list = await thTenantSelectList();
     tenantOptions.value = list;
-    const firstId = list[0]?.id ?? DEFAULT_TENANT_ID;
-    loginFormRef.value?.getFormApi().setFieldValue('tenantId', firstId);
-    loginTenantId.value = firstId;
+    const lastTenantId = localStorage.getItem(LAST_TENANT_KEY);
+    const selectedId =
+      list.find((item) => item.id === lastTenantId)?.id ??
+      list[0]?.id ??
+      DEFAULT_TENANT_ID;
+    loginFormRef.value?.getFormApi().setFieldValue('tenantId', selectedId);
+    loginTenantId.value = selectedId;
   } catch (error) {
     console.error(error);
     tenantOptions.value = [];
@@ -153,6 +158,7 @@ async function handleAccountLogin(values: LoginAndRegisterParams) {
         ? { code: String(values.code ?? ''), uuid: captchaInfo.value.uuid }
         : {}),
     });
+    localStorage.setItem(LAST_TENANT_KEY, String(values.tenantId ?? ''));
   } catch (error) {
     console.error(error);
     if (error instanceof Error && captchaInfo.value.isEnableCaptcha) {
@@ -9,27 +9,27 @@ export const querySchema: FormSchemaGetter = () =&gt; [...keywordFilterSchema()];
 export const columns: VxeGridProps['columns'] = [
   {
     field: 'companyName',
-    title: '租户名称',
     minWidth: 180,
     slots: { default: 'companyName' },
+    title: '租户名称',
   },
   {
     field: 'companyCode',
-    title: '租户 ID',
     minWidth: 260,
     slots: { default: 'tenantId' },
+    title: '租户 ID',
   },
   {
     field: 'remark',
-    title: '连接串 / 数据库',
     minWidth: 240,
     slots: { default: 'connectionString' },
+    title: '连接串 / 数据库',
   },
   {
     field: 'creationTime',
-    title: '创建时间',
     minWidth: 160,
     slots: { default: 'creationTime' },
+    title: '创建时间',
   },
   foodLabelingActionColumn({ minWidth: 120 }),
 ];
@@ -84,7 +84,7 @@ async function handleDelete(row: SaasTenantDto) {
 function confirmDelete(row: SaasTenantDto) {
   Modal.confirm({
     okType: 'danger',
-    title: $t('foodLabeling.platform.deleteCompanyConfirm'),
+    title: '确认删除该租户？',
     onOk: () => handleDelete(row),
   });
 }
@@ -94,23 +94,25 @@ function confirmDelete(row: SaasTenantDto) {
   <Page :auto-content-height="true" :content-class="managementTabPageContentClass">
     <Alert
       class="mb-3 shrink-0"
-      message="平台管理员：此处通过 tenant-select 查看租户，通过 provision 开通独立库租户；业务接口会依赖登录 Token 或 __tenant 请求头识别租户上下文。"
+      message="平台管理员：此处通过 tenant-select 查看租户，通过 provision 开通独立库租户；业务接口依赖登录 Token 或 __tenant 请求头识别租户上下文。"
       show-icon
       type="info"
     />
     <BasicTable :class="managementTabTableClass">
       <template #toolbar-tools>
-        <Button type="primary" @click="handleAdd">
-          {{ $t('foodLabeling.platform.addCompany') }}
-        </Button>
+        <Button type="primary" @click="handleAdd">开通租户</Button>
       </template>
       <template #companyName="{ row }">
         <div class="flex min-w-0 items-center gap-2">
           <Avatar v-if="row.logoUrl" :src="row.logoUrl" size="small" />
-          <Avatar v-else size="small">{{ (row.companyName ?? '?').slice(0, 1) }}</Avatar>
-          <span class="truncate font-medium">{{ displayText(row.companyName) }}</span>
+          <Avatar v-else size="small">
+            {{ (row.companyName ?? '?').slice(0, 1) }}
+          </Avatar>
+          <span class="truncate font-medium">
+            {{ displayText(row.companyName) }}
+          </span>
         </div>
       </template>
@@ -20,16 +20,14 @@ const entityVersion = ref&lt;number | undefined&gt;();
 const dbType = ref<number | undefined>();
 const title = computed(() =>
-  isUpdate.value
-    ? $t('foodLabeling.platform.editCompany')
-    : $t('foodLabeling.platform.addCompany'),
+  isUpdate.value ? '编辑租户' : '开通租户',
 );
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
+    componentProps: { class: 'w-full' },
     formItemClass: 'col-span-2',
     labelWidth: 120,
-    componentProps: { class: 'w-full' },
   },
   schema: [
     {
@@ -40,23 +38,23 @@ const [BasicForm, formApi] = useVbenForm({
     },
     {
       component: 'Input',
-      fieldName: 'tenantConnectionString',
-      label: '自定义连接串',
-      formItemClass: 'col-span-2',
       componentProps: {
         placeholder: '可选；为空时后端按租户名称自动生成业务库连接串',
       },
+      fieldName: 'tenantConnectionString',
+      formItemClass: 'col-span-2',
+      label: '自定义连接串',
     },
     {
       component: 'Switch',
-      fieldName: 'initializeDatabase',
-      label: '初始化数据库',
-      defaultValue: true,
       componentProps: { class: 'w-fit' },
+      defaultValue: true,
       dependencies: {
         if: () => !isUpdate.value,
         triggerFields: ['companyName'],
       },
+      fieldName: 'initializeDatabase',
+      label: '初始化数据库',
     },
   ],
   showDefaultActions: false,
@@ -103,26 +101,29 @@ async function handleConfirm() {
       return;
     }
     const values = cloneDeep(await formApi.getValues()) as Record<string, unknown>;
+    const name = String(values.companyName ?? '').trim();
+    const tenantConnectionString = String(
+      values.tenantConnectionString ?? '',
+    ).trim();
+
     if (isUpdate.value && recordId.value) {
       await saasTenantUpdate({
         dbType: dbType.value,
         entityVersion: entityVersion.value,
         id: recordId.value,
-        name: String(values.companyName ?? '').trim(),
-        tenantConnectionString: String(
-          values.tenantConnectionString ?? '',
-        ).trim(),
+        name,
+        tenantConnectionString,
       });
     } else {
-      await thProvisionTenant({
+      const result = await thProvisionTenant({
         dbType: 0,
         initializeDatabase: values.initializeDatabase !== false,
-        name: String(values.companyName ?? '').trim(),
-        tenantConnectionString: String(
-          values.tenantConnectionString ?? '',
-        ).trim(),
+        name,
+        tenantConnectionString,
       });
+      console.info('TH tenant provisioned', result);
     }
+
     message.success($t('http.operationSuccess'));
     emit('reload');
     await handleCancel();
@@ -142,7 +143,7 @@ async function handleCancel() {
     <a-alert
       v-if="!isUpdate"
       class="mb-4"
-      :message="$t('foodLabeling.platform.initialAdminSection')"
+      message="调用 /api/app/th-tenant-provisioning/provision，在主库登记租户并按需初始化独立业务库。"
       show-icon
       type="info"
     />
@@ -4,10 +4,13 @@ import type { UsAppMyProfileOutputDto } from &#39;../services/usAppAuth&#39;
 export function isAppAdminUser(profile: UsAppMyProfileOutputDto | null | undefined): boolean {
   if (!profile) return false
   const code = (profile.primaryRoleCode ?? '').trim().toLowerCase()
+  const compactCode = code.replace(/[\s_-]+/g, '')
   if (code === 'admin') return true
+  if (compactCode === 'companyadmin') return true
   const display = (profile.roleDisplay ?? '').trim().toLowerCase()
   if (!display) return false
   if (display.includes('administrator')) return true
   if (display.includes('super admin')) return true
+  if (display.includes('company admin')) return true
   return false
 }
@@ -143,6 +143,8 @@ function locationsForCategoryAvailability(c: LabelCategoryDto, catalog: Location
 }
 function categoryRegionSummary(c: LabelCategoryDto, catalog: LocationDto[]): string {
+  const apiRegion = (c.region ?? "").trim();
+  if (apiRegion) return apiRegion;
   const at = String(c.availabilityType ?? "ALL").trim().toUpperCase();
   if (at !== "SPECIFIED") return "All";
   const matched = locationsForCategoryAvailability(c, catalog);
@@ -152,6 +154,8 @@ function categoryRegionSummary(c: LabelCategoryDto, catalog: LocationDto[]): str
 }
 function categoryLocationLines(c: LabelCategoryDto, catalog: LocationDto[]): string[] {
+  const apiLoc = (c.location ?? "").trim();
+  if (apiLoc) return apiLoc.split(/\s*;\s*/).map((x) => x.trim()).filter(Boolean);
   const at = String(c.availabilityType ?? "ALL").trim().toUpperCase();
   if (at !== "SPECIFIED") return ["All"];
   const matched = locationsForCategoryAvailability(c, catalog);
@@ -372,7 +372,9 @@ export function clampLabelElementBox(
   baseH: number,
   marginPx: number = LABEL_CANVAS_SAFE_MARGIN_PX,
   orientation: PrintOrientation = 'vertical',
+  snap: boolean = true,
 ): { x: number; y: number; w: number; h: number } {
+  const align = snap ? snapToGrid : (value: number) => value;
   if (orientation === 'horizontal') {
     const cx = baseW / 2;
     const cy = baseH / 2;
@@ -384,21 +386,21 @@ export function clampLabelElementBox(
       return {
         x: minX,
         y: minY,
-        w: Math.max(GRID_SIZE, snapToGrid(innerW)),
-        h: Math.max(GRID_SIZE, snapToGrid(innerH)),
+        w: Math.max(GRID_SIZE, align(innerW)),
+        h: Math.max(GRID_SIZE, align(innerH)),
       };
     }
-    let cw = Math.min(Math.max(20, snapToGrid(w)), snapToGrid(innerW));
-    let ch = Math.min(Math.max(12, snapToGrid(h)), snapToGrid(innerH));
+    let cw = Math.min(Math.max(20, align(w)), align(innerW));
+    let ch = Math.min(Math.max(12, align(h)), align(innerH));
     const maxX = baseH - marginPx + cx - cy - cw;
     const maxY = cx + cy - marginPx - ch;
     if (maxX < minX || maxY < minY) {
-      return { x: minX, y: minY, w: snapToGrid(innerW), h: snapToGrid(innerH) };
+      return { x: minX, y: minY, w: align(innerW), h: align(innerH) };
     }
-    let nx = snapToGrid(x);
-    let ny = snapToGrid(y);
-    nx = Math.min(Math.max(nx, minX), snapToGrid(maxX));
-    ny = Math.min(Math.max(ny, minY), snapToGrid(maxY));
+    let nx = align(x);
+    let ny = align(y);
+    nx = Math.min(Math.max(nx, minX), align(maxX));
+    ny = Math.min(Math.max(ny, minY), align(maxY));
     return { x: nx, y: ny, w: cw, h: ch };
   }
@@ -406,22 +408,22 @@ export function clampLabelElementBox(
   const minY = marginPx;
   const maxR = baseW - marginPx;
   const maxB = baseH - marginPx;
-  let cw = Math.max(20, snapToGrid(w));
-  let ch = Math.max(12, snapToGrid(h));
+  let cw = Math.max(20, align(w));
+  let ch = Math.max(12, align(h));
   const innerW = maxR - minX;
   const innerH = maxB - minY;
   if (innerW < GRID_SIZE || innerH < GRID_SIZE) {
     return {
       x: minX,
       y: minY,
-      w: Math.max(GRID_SIZE, snapToGrid(innerW)),
-      h: Math.max(GRID_SIZE, snapToGrid(innerH)),
+      w: Math.max(GRID_SIZE, align(innerW)),
+      h: Math.max(GRID_SIZE, align(innerH)),
     };
   }
-  cw = Math.min(cw, snapToGrid(innerW));
-  ch = Math.min(ch, snapToGrid(innerH));
-  let cx = snapToGrid(x);
-  let cy = snapToGrid(y);
+  cw = Math.min(cw, align(innerW));
+  ch = Math.min(ch, align(innerH));
+  let cx = align(x);
+  let cy = align(y);
   cx = Math.min(Math.max(cx, minX), Math.max(minX, maxR - cw));
   cy = Math.min(Math.max(cy, minY), Math.max(minY, maxB - ch));
   return { x: cx, y: cy, w: cw, h: ch };
@@ -14,7 +14,6 @@ import { Switch } from &#39;../../ui/switch&#39;;
 import type {
   LabelTemplate,
   LabelElement,
-  Unit,
   Rotation,
   Border,
   NutritionExtraItem,
@@ -53,12 +52,10 @@ import {
 } from '../../../utils/textElementLayout';
 import {
   type PreviewRulerDisplayUnit,
-  displayLengthToElementPx,
-  elementPxToDisplayLength,
   formatPreviewRulerDisplayValue,
   previewRulerUnitLabel,
 } from '../../../utils/previewRulerUnits';
-import { unitToPx } from '../../../utils/labelTemplateUnits';
+import { pxToUnit, unitToPx } from '../../../utils/labelTemplateUnits';
 import { ImageUrlUpload } from '../../ui/image-url-upload';
 import { readImageScaleMode } from '../../../utils/imageScaleMode';
 import {
@@ -111,7 +108,7 @@ interface PropertiesPanelProps {
   template: LabelTemplate;
   selectedElement: LabelElement | null;
   onTemplateChange: (patch: Partial<LabelTemplate>) => void;
-  onElementChange: (id: string, patch: Partial<LabelElement>) => void;
+  onElementChange: (id: string, patch: Partial<LabelElement>, options?: { snapToGrid?: boolean }) => void;
   onDeleteElement?: (id: string) => void;
   /** 编辑已有模板时禁止修改 Template Code */
   readOnlyTemplateCode?: boolean;
@@ -186,27 +183,23 @@ export function PropertiesPanel({
               <ElementDimensionField
                 label="Width"
                 pxValue={selectedElement.width}
-                paperSizeTemplate={template.width}
-                templateUnit={template.unit}
                 displayUnit={previewRulerUnit}
                 disabled={positionLocked}
                 onPxChange={(width) =>
                   onElementChange(selectedElement.id, {
                     width: Math.max(1, width),
-                  })
+                  }, { snapToGrid: false })
                 }
               />
               <ElementDimensionField
                 label="Height"
                 pxValue={selectedElement.height}
-                paperSizeTemplate={template.height}
-                templateUnit={template.unit}
                 displayUnit={previewRulerUnit}
                 disabled={positionLocked}
                 onPxChange={(height) =>
                   onElementChange(selectedElement.id, {
                     height: Math.max(1, height),
-                  })
+                  }, { snapToGrid: false })
                 }
               />
             </div>
@@ -549,29 +542,17 @@ function CompanyPrintFieldsEditor({
 function ElementDimensionField({
   label,
   pxValue,
-  paperSizeTemplate,
-  templateUnit,
   displayUnit,
   onPxChange,
   disabled = false,
 }: {
   label: string;
   pxValue: number;
-  paperSizeTemplate: number;
-  templateUnit: Unit;
   displayUnit: PreviewRulerDisplayUnit;
   onPxChange: (px: number) => void;
   disabled?: boolean;
 }) {
-  const basePaperPx = unitToPx(Number(paperSizeTemplate) || 0, templateUnit);
-  const paperSize = Number(paperSizeTemplate) || 0;
-  const displayValue = elementPxToDisplayLength(
-    pxValue,
-    basePaperPx,
-    paperSize,
-    templateUnit,
-    displayUnit,
-  );
+  const displayValue = pxToUnit(pxValue, displayUnit);
   const formatted = formatPreviewRulerDisplayValue(displayValue, displayUnit);
   const unitLabel = previewRulerUnitLabel(displayUnit);
   const step = displayUnit === 'mm' ? 1 : displayUnit === 'inch' ? 0.0001 : 0.001;
@@ -585,19 +566,11 @@ function ElementDimensionField({
       if (trimmed === '' || trimmed === '-' || trimmed === '.') return false;
       const nextDisplay = Number(trimmed);
       if (!Number.isFinite(nextDisplay)) return false;
-      const nextPx = Math.round(
-        displayLengthToElementPx(
-          nextDisplay,
-          basePaperPx,
-          paperSize,
-          templateUnit,
-          displayUnit,
-        ),
-      );
+      const nextPx = unitToPx(nextDisplay, displayUnit);
       onPxChange(Math.max(1, nextPx));
       return true;
     },
-    [basePaperPx, displayUnit, onPxChange, paperSize, templateUnit],
+    [displayUnit, onPxChange],
   );
   return (
@@ -618,17 +591,7 @@ function ElementDimensionField({
             setEditing(false);
           }}
           onChange={(e) => {
-            const raw = e.target.value;
-            setDraft(raw);
-            const trimmed = raw.trim();
-            if (
-              trimmed !== '' &&
-              trimmed !== '-' &&
-              !trimmed.endsWith('.') &&
-              !trimmed.endsWith('-')
-            ) {
-              commitDisplay(raw);
-            }
+            setDraft(e.target.value);
           }}
           onKeyDown={(e) => {
             if (e.key === 'Enter') {
@@ -1038,6 +1001,7 @@ function ElementConfigFields({
               onChange={(e) => update('data', e.target.value)}
               className="h-8 text-sm mt-1"
             />
+            <p className="text-[10px] text-gray-400 mt-1">{DEMO_VALUE_HINT}</p>
           </div>
           <div className="grid grid-cols-2 gap-2">
             <div>
@@ -1089,6 +1053,7 @@ function ElementConfigFields({
             onChange={(e) => update('data', e.target.value)}
             className="h-8 text-sm mt-1"
           />
+          <p className="text-[10px] text-gray-400 mt-1">{DEMO_VALUE_HINT}</p>
         </div>
       );
     case 'IMAGE': {
@@ -401,7 +401,7 @@ export function LabelTemplateEditor({
   /** 配置区单行 flex */
   const configRowClass = "flex w-full min-w-0 flex-wrap items-center gap-2";
-  const updateElement = useCallback((id: string, patch: Partial<LabelElement>) => {
+  const updateElement = useCallback((id: string, patch: Partial<LabelElement>, options?: { snapToGrid?: boolean }) => {
     const geomTouched =
       patch.x !== undefined ||
       patch.y !== undefined ||
@@ -451,6 +451,7 @@ export function LabelTemplateEditor({
             baseH,
             undefined,
             orientation,
+            options?.snapToGrid ?? true,
           );
           return {
             ...merged,
@@ -139,6 +139,7 @@ export type LocationsViewProps = {
 };
 export function LocationsView({ renderBeforeTabs, canMutateLocations = true }: LocationsViewProps = {}) {
+  const scopeAuth = useCategoryScopeAuth();
   const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
   const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
   const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
@@ -164,6 +165,7 @@ export function LocationsView({ renderBeforeTabs, canMutateLocations = true }: L
   /** 筛选栏：公司 / 区域选项来自接口，而非当前门店分页结果去重 */
   const [filterPartnerOptions, setFilterPartnerOptions] = useState<PartnerListItem[]>([]);
   const [filterGroupOptions, setFilterGroupOptions] = useState<GroupListItem[]>([]);
+  const [filterLocationOptions, setFilterLocationOptions] = useState<LocationDto[]>([]);
   const [pageIndex, setPageIndex] = useState(1);
   const [pageSize, setPageSize] = useState(10);
@@ -194,6 +196,15 @@ export function LocationsView({ renderBeforeTabs, canMutateLocations = true }: L
     return ["all", ...names];
   }, [filterPartnerOptions]);
+  const fixedPartnerName = useMemo(() => {
+    if (scopeAuth.requireCompanySelection) return "";
+    const fixedPartnerId = scopeAuth.fixedPartnerId.trim();
+    if (!fixedPartnerId) return "";
+    return (
+      filterPartnerOptions.find((p) => p.id === fixedPartnerId)?.partnerName?.trim() ?? ""
+    );
+  }, [scopeAuth.requireCompanySelection, scopeAuth.fixedPartnerId, filterPartnerOptions]);
+
   const groupOptions = useMemo(() => {
     const names = filterGroupOptions
       .map((g) => (g.groupName ?? "").trim())
@@ -204,12 +215,12 @@ export function LocationsView({ renderBeforeTabs, canMutateLocations = true }: L
   const locationOptions = useMemo(() => {
     const s = new Set<string>();
-    for (const x of locations) {
-      const v = (x.locationCode ?? "").trim();
+    for (const x of filterLocationOptions) {
+      const v = (x.locationName ?? "").trim();
       if (v) s.add(v);
     }
     return ["all", ...Array.from(s).sort((a, b) => a.localeCompare(b))];
-  }, [locations]);
+  }, [filterLocationOptions]);
   const totalPages = Math.max(1, Math.ceil(total / pageSize));
@@ -227,6 +238,12 @@ export function LocationsView({ renderBeforeTabs, canMutateLocations = true }: L
   }, []);
   useEffect(() => {
+    if (scopeAuth.requireCompanySelection) return;
+    if (!fixedPartnerName || partner === fixedPartnerName) return;
+    setPartner(fixedPartnerName);
+  }, [scopeAuth.requireCompanySelection, fixedPartnerName, partner]);
+
+  useEffect(() => {
     const ac = new AbortController();
     (async () => {
       try {
@@ -271,6 +288,38 @@ export function LocationsView({ renderBeforeTabs, canMutateLocations = true }: L
   }, [groupName, groupOptions]);
   useEffect(() => {
+    const ac = new AbortController();
+    (async () => {
+      try {
+        const out: LocationDto[] = [];
+        const size = 100;
+        for (let page = 1; page <= 200; page += 1) {
+          const res = await getLocations(
+            {
+              skipCount: page,
+              maxResultCount: size,
+              partner: partner !== "all" ? partner : undefined,
+              groupName: groupName !== "all" ? groupName : undefined,
+            },
+            ac.signal,
+          );
+          out.push(...(res.items ?? []));
+          if (!res.items || res.items.length < size) break;
+        }
+        setFilterLocationOptions(out);
+      } catch {
+        if (!ac.signal.aborted) setFilterLocationOptions([]);
+      }
+    })();
+    return () => ac.abort();
+  }, [partner, groupName, refreshSeq]);
+
+  useEffect(() => {
+    if (locationPick === "all") return;
+    if (!locationOptions.includes(locationPick)) setLocationPick("all");
+  }, [locationPick, locationOptions]);
+
+  useEffect(() => {
     // When filter changes, reset to first page.
     setPageIndex(1);
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -351,18 +400,20 @@ export function LocationsView({ renderBeforeTabs, canMutateLocations = true }: L
             style={{ height: 40, boxSizing: "border-box" }}
             className="border border-gray-300 rounded-md w-40 shrink-0 bg-white placeholder:text-gray-500"
           />
-          <Select value={partner} onValueChange={setPartner}>
-            <SelectTrigger className="w-[140px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0" style={{ height: 40, boxSizing: "border-box" }}>
-              <SelectValue placeholder="Company" />
-            </SelectTrigger>
-            <SelectContent>
-              {partnerOptions.map((p) => (
-                <SelectItem key={p} value={p}>
-                  {p === "all" ? "Company (All)" : p}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
+          {scopeAuth.requireCompanySelection ? (
+            <Select value={partner} onValueChange={setPartner}>
+              <SelectTrigger className="w-[140px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0" style={{ height: 40, boxSizing: "border-box" }}>
+                <SelectValue placeholder="Company" />
+              </SelectTrigger>
+              <SelectContent>
+                {partnerOptions.map((p) => (
+                  <SelectItem key={p} value={p}>
+                    {p === "all" ? "Company (All)" : p}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          ) : null}
           <Select value={groupName} onValueChange={setGroupName}>
             <SelectTrigger className="w-[140px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0" style={{ height: 40, boxSizing: "border-box" }}>
               <SelectValue placeholder="Region" />
@@ -187,13 +187,6 @@ function normLocationId(id: string | null | undefined): string {
   return String(id ?? "").trim().toLowerCase();
 }
-function memberMatchesLocationScope(m: TeamMemberDto, allowedLocationIds: Set<string> | null): boolean {
-  if (allowedLocationIds === null) return true;
-  if (allowedLocationIds.size === 0) return false;
-  const ids = (m.locationIds ?? []).map((x) => String(x).trim()).filter(Boolean);
-  return ids.some((id) => allowedLocationIds.has(id));
-}
-
 // --- Types ---
 type ViewTab = "Roles" | "Partner" | "Group" | "Location Manager" | "Team Member";
@@ -247,6 +240,7 @@ export function PeopleView({
   onProfileEditIntentConsumed,
 }: PeopleViewProps = {}) {
   const auth = useAuth();
+  const scopeAuth = useCategoryScopeAuth();
   const canAmStructureMutate = useMemo(
     () =>
       canMutateAccountManagementStructure({
@@ -564,22 +558,6 @@ export function PeopleView({
     [memberFilterLocations, memberSelectedPartner, memberSelectedGroup],
   );
-  const memberUsesClientScopeFilter = useMemo(
-    () =>
-      memberLocationFilter === "all" &&
-      (memberPartnerFilter !== "all" || memberGroupFilter !== "all"),
-    [memberPartnerFilter, memberGroupFilter, memberLocationFilter],
-  );
-
-  const memberAllowedLocationIds = useMemo((): Set<string> | null => {
-    if (memberLocationFilter !== "all" || !memberUsesClientScopeFilter) return null;
-    const ids = new Set<string>();
-    for (const loc of memberLocationsForSelect) {
-      if (loc.id) ids.add(loc.id);
-    }
-    return ids;
-  }, [memberLocationFilter, memberUsesClientScopeFilter, memberLocationsForSelect]);
-
   useEffect(() => {
     if (activeTab !== "Team Member") return;
     const ac = new AbortController();
@@ -603,9 +581,10 @@ export function PeopleView({
   }, [activeTab, memberRefreshSeq]);
   useEffect(() => {
+    if (!scopeAuth.requireCompanySelection) return;
     if (memberPartnerFilter === "all") return;
     if (!memberCompanyOptions.some((p) => p.id === memberPartnerFilter)) setMemberPartnerFilter("all");
-  }, [memberPartnerFilter, memberCompanyOptions]);
+  }, [scopeAuth.requireCompanySelection, memberPartnerFilter, memberCompanyOptions]);
   useEffect(() => {
     if (memberGroupFilter === "all") return;
@@ -626,6 +605,19 @@ export function PeopleView({
   }, [debouncedGroupKeyword, groupPageSize, groupPartnerFilter, groupStatusFilter]);
   useEffect(() => {
+    if (scopeAuth.requireCompanySelection) return;
+    const fixed = scopeAuth.fixedPartnerId.trim();
+    if (!fixed) return;
+    if (groupPartnerFilter !== fixed) setGroupPartnerFilter(fixed);
+    if (memberPartnerFilter !== fixed) setMemberPartnerFilter(fixed);
+  }, [
+    scopeAuth.requireCompanySelection,
+    scopeAuth.fixedPartnerId,
+    groupPartnerFilter,
+    memberPartnerFilter,
+  ]);
+
+  useEffect(() => {
     if (activeTab !== "Group") return;
     const ac = new AbortController();
     (async () => {
@@ -763,38 +755,25 @@ export function PeopleView({
       setMembersLoading(true);
       try {
+        const partnerIdParam =
+          memberPartnerFilter !== "all" ? memberPartnerFilter : undefined;
+        const groupIdParam =
+          memberGroupFilter !== "all" ? memberGroupFilter : undefined;
         const locationIdParam =
           memberLocationFilter !== "all" ? memberLocationFilter : undefined;
-
-        if (memberUsesClientScopeFilter) {
-          const res = await getTeamMembers(
-            {
-              skipCount: 1,
-              maxResultCount: 500,
-              keyword: debouncedMemberKeyword || undefined,
-            },
-            ac.signal,
-          );
-          const filtered = (res.items ?? []).filter((m) =>
-            memberMatchesLocationScope(m, memberAllowedLocationIds),
-          );
-          const total = filtered.length;
-          const start = (memberPageIndex - 1) * memberPageSize;
-          setMembers(filtered.slice(start, start + memberPageSize));
-          setMemberTotal(total);
-        } else {
-          const res = await getTeamMembers(
-            {
-              skipCount: Math.max(1, memberPageIndex),
-              maxResultCount: memberPageSize,
-              keyword: debouncedMemberKeyword || undefined,
-              locationId: locationIdParam,
-            },
-            ac.signal,
-          );
-          setMembers(res.items ?? []);
-          setMemberTotal(res.totalCount ?? 0);
-        }
+        const res = await getTeamMembers(
+          {
+            skipCount: Math.max(1, memberPageIndex),
+            maxResultCount: memberPageSize,
+            keyword: debouncedMemberKeyword || undefined,
+            partnerId: partnerIdParam,
+            groupId: groupIdParam,
+            locationId: locationIdParam,
+          },
+          ac.signal,
+        );
+        setMembers(res.items ?? []);
+        setMemberTotal(res.totalCount ?? 0);
       } catch (e: any) {
         if (e?.name === "AbortError") return;
         toast.error("Failed to load team members.", {
@@ -815,9 +794,9 @@ export function PeopleView({
     memberPageIndex,
     memberPageSize,
     memberRefreshSeq,
+    memberPartnerFilter,
+    memberGroupFilter,
     memberLocationFilter,
-    memberUsesClientScopeFilter,
-    memberAllowedLocationIds,
   ]);
   const openCreateDialog = () => {
@@ -914,19 +893,21 @@ export function PeopleView({
           )}
           {activeTab === "Team Member" && (
             <>
-              <Select value={memberPartnerFilter} onValueChange={setMemberPartnerFilter}>
-                <SelectTrigger className="w-[160px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0">
-                  <SelectValue placeholder="Company" />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value="all">All Companies</SelectItem>
-                  {memberCompanyOptions.map((p) => (
-                    <SelectItem key={p.id} value={p.id}>
-                      {(p.partnerName ?? "").trim() || p.id}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
+              {scopeAuth.requireCompanySelection ? (
+                <Select value={memberPartnerFilter} onValueChange={setMemberPartnerFilter}>
+                  <SelectTrigger className="w-[160px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0">
+                    <SelectValue placeholder="Company" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="all">All Companies</SelectItem>
+                    {memberCompanyOptions.map((p) => (
+                      <SelectItem key={p.id} value={p.id}>
+                        {(p.partnerName ?? "").trim() || p.id}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              ) : null}
               <Select value={memberGroupFilter} onValueChange={setMemberGroupFilter}>
                 <SelectTrigger className="w-[160px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0">
                   <SelectValue placeholder="Region" />
@@ -957,19 +938,21 @@ export function PeopleView({
           )}
           {activeTab === "Group" && (
             <>
-              <Select value={groupPartnerFilter} onValueChange={setGroupPartnerFilter}>
-                <SelectTrigger className="w-[180px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0">
-                  <SelectValue placeholder="Parent company" />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value="all">Company (All)</SelectItem>
-                  {groupFilterPartnerOptions.map((p) => (
-                    <SelectItem key={p.id} value={p.id}>
-                      {p.partnerName ?? p.id}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
+              {scopeAuth.requireCompanySelection ? (
+                <Select value={groupPartnerFilter} onValueChange={setGroupPartnerFilter}>
+                  <SelectTrigger className="w-[180px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0">
+                    <SelectValue placeholder="Parent company" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="all">Company (All)</SelectItem>
+                    {groupFilterPartnerOptions.map((p) => (
+                      <SelectItem key={p.id} value={p.id}>
+                        {p.partnerName ?? p.id}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              ) : null}
               <Select
                 value={groupStatusFilter}
                 onValueChange={(v) => setGroupStatusFilter(v as "all" | "active" | "inactive")}
@@ -286,6 +286,7 @@ async function loadAllLocationsForCatalog(signal?: AbortSignal): Promise&lt;Locatio
 }
 export function ProductsView() {
+  const scopeAuth = useCategoryScopeAuth();
   const [activeTab, setActiveTab] = useState<"products" | "categories">("products");
   const [products, setProducts] = useState<ProductDto[]>([]);
   const [total, setTotal] = useState(0);
@@ -383,6 +384,13 @@ export function ProductsView() {
   }, [debouncedKeyword, companyFilter, regionFilter, locationFilter, categoryFilter, stateFilter, pageSize]);
   useEffect(() => {
+    if (scopeAuth.requireCompanySelection) return;
+    const fixed = scopeAuth.fixedPartnerId.trim();
+    if (!fixed || companyFilter === fixed) return;
+    setCompanyFilter(fixed);
+  }, [scopeAuth.requireCompanySelection, scopeAuth.fixedPartnerId, companyFilter]);
+
+  useEffect(() => {
     setCatPageIndex(1);
   }, [debouncedKeyword, stateFilter, catPageSize, companyFilter, regionFilter, locationFilter]);
@@ -449,9 +457,10 @@ export function ProductsView() {
   }, [regionFilter]);
   useEffect(() => {
+    if (!scopeAuth.requireCompanySelection) return;
     if (companyFilter === "all") return;
     if (!companyOptions.some((p) => p.id === companyFilter)) setCompanyFilter("all");
-  }, [companyFilter, companyOptions]);
+  }, [scopeAuth.requireCompanySelection, companyFilter, companyOptions]);
   useEffect(() => {
     if (regionFilter === "all") return;
@@ -694,22 +703,24 @@ export function ProductsView() {
                 className="flex-1 min-w-0 border-0 bg-transparent focus-visible:ring-0 focus-visible:ring-offset-0 py-2 px-2 h-full placeholder:text-gray-500"
               />
             </div>
-            <Select value={companyFilter} onValueChange={setCompanyFilter}>
-              <SelectTrigger
-                className="w-[140px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0"
-                style={{ height: 40, boxSizing: "border-box" }}
-              >
-                <SelectValue placeholder="Company" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="all">All Companies</SelectItem>
-                {companyOptions.map((c) => (
-                  <SelectItem key={c.id} value={c.id}>
-                    {toDisplay(c.partnerName)}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
+            {scopeAuth.requireCompanySelection ? (
+              <Select value={companyFilter} onValueChange={setCompanyFilter}>
+                <SelectTrigger
+                  className="w-[140px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0"
+                  style={{ height: 40, boxSizing: "border-box" }}
+                >
+                  <SelectValue placeholder="Company" />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="all">All Companies</SelectItem>
+                  {companyOptions.map((c) => (
+                    <SelectItem key={c.id} value={c.id}>
+                      {toDisplay(c.partnerName)}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            ) : null}
             <Select value={regionFilter} onValueChange={setRegionFilter}>
               <SelectTrigger
                 className="w-[140px] h-10 rounded-md border border-gray-300 bg-white font-medium text-gray-900 shrink-0"
@@ -31,6 +31,8 @@ export type LabelCategoryDto = {
   locationIds?: string[] | null;
   /** 列表：Company 展示 */
   company?: string | null;
+  region?: string | null;
+  location?: string | null;
   /** 最近编辑时间（列表接口映射 LastModificationTime ?? CreationTime） */
   lastEdited?: string | null;
 };