feat(cultivate-flower): 新增等待时长字段并更新阶段规则校验逻辑

web/src/views/cultivate/flowers/edit.vue

@@ -17,6 +17,7 @@
         <n-grid cols="1 s:1 m:3" responsive="screen" :x-gap="12">
           <n-gi><n-form-item label="下一阶段"><n-input v-model:value="rule.nextStage" disabled /></n-form-item></n-gi>
           <n-gi><n-form-item label="升级成长值"><n-input-number v-model:value="rule.requiredPoints" :min="0" /></n-form-item></n-gi>
+          <n-gi><n-form-item label="等待时长(小时)" :show-feedback="false"><n-input-number v-model:value="rule.waitHours" :min="0" :disabled="rule.stage === 'bloom'" placeholder="0 表示不等待" /></n-form-item></n-gi>
           <n-gi><n-form-item label="允许动作"><n-select v-model:value="rule.allowedActions" multiple :options="actionOptions" /></n-form-item></n-gi>
           <n-gi><n-form-item label="浇水成长值"><n-input-number v-model:value="rule.waterPoints" :min="0" /></n-form-item></n-gi>
           <n-gi><n-form-item label="施肥成长值"><n-input-number v-model:value="rule.fertilizePoints" :min="0" /></n-form-item></n-gi>
@@ -35,10 +36,10 @@
 import { ref } from 'vue';
 import { useMessage } from 'naive-ui';
 import { Edit, View } from '@/api/cultivate/flowers';
-import { actionOptions, newState, rules, State, statusOptions } from './model';
+import { actionOptions, newState, rules, State, statusOptions, validateStageRules } from './model';
 const emit=defineEmits(['reloadTable']);const message=useMessage();const showModal=ref(false);const loading=ref(false);const submitting=ref(false);const formRef=ref();const formValue=ref<State>(newState(null));
 function openModal(state:State|null){showModal.value=true;formValue.value=newState(null);if(!state?.id)return;loading.value=true;View({id:state.id}).then((res)=>formValue.value=newState(res)).finally(()=>loading.value=false)}
-function submit(){formRef.value?.validate((errors)=>{if(errors){message.error('请检查配置内容');return}submitting.value=true;Edit(formValue.value).then(()=>{message.success('配置已保存');showModal.value=false;emit('reloadTable')}).finally(()=>submitting.value=false)})}
+function submit(){formRef.value?.validate((errors)=>{if(errors){message.error('请检查配置内容');return}const stageError=validateStageRules(formValue.value.stageRules);if(stageError){message.error(stageError);return}submitting.value=true;Edit(formValue.value).then(()=>{message.success('配置已保存');showModal.value=false;emit('reloadTable')}).finally(()=>submitting.value=false)})}
 defineExpose({openModal});
 </script>
 

web/src/views/cultivate/flowers/model.ts

@@ -13,6 +13,7 @@ export interface StageRule {
   requiredPoints: number;
   waterPoints: number;
   fertilizePoints: number;
+  waitHours: number;
   allowedActions: string[];
   imageFileId: string;
   animationFileId: string;
@@ -41,16 +42,31 @@ export class State {
 
 export function defaultStageRules(): StageRule[] {
   return [
-    stageRule('seed', 'sprout', 12, 1, 0, ['water'], 10),
-    stageRule('sprout', 'bud', 60, 1, 0, ['water'], 20),
-    stageRule('bud', 'bloom', 90, 1, 5, ['water', 'fertilize'], 30),
-    stageRule('bloom', '', 0, 0, 0, [], 40),
+    stageRule('seed', 'sprout', 12, 1, 0, 36, ['water'], 10),
+    stageRule('sprout', 'bud', 18, 1, 0, 60, ['water'], 20),
+    stageRule('bud', 'bloom', 24, 1, 6, 72, ['water', 'fertilize'], 30),
+    stageRule('bloom', '', 0, 0, 0, 0, [], 40),
   ];
 }
-function stageRule(stage: string, nextStage: string, requiredPoints: number, waterPoints: number, fertilizePoints: number, allowedActions: string[], sortNo: number): StageRule {
-  return { stage, nextStage, requiredPoints, waterPoints, fertilizePoints, allowedActions, imageFileId: '', animationFileId: '', progressTextTemplate: '', completionText: '', sortNo };
+function stageRule(stage: string, nextStage: string, requiredPoints: number, waterPoints: number, fertilizePoints: number, waitHours: number, allowedActions: string[], sortNo: number): StageRule {
+  return { stage, nextStage, requiredPoints, waterPoints, fertilizePoints, waitHours, allowedActions, imageFileId: '', animationFileId: '', progressTextTemplate: '', completionText: '', sortNo };
+}
+
+// 非 bloom 阶段升级阈值与等待时长不能同时为 0（与 cultivate_server 校验一致）
+export function validateStageRules(stageRules: StageRule[]): string | null {
+  for (const rule of stageRules) {
+    if (rule.stage !== 'bloom' && rule.requiredPoints === 0 && rule.waitHours === 0) {
+      return `阶段 ${rule.stage} 的升级成长值与等待时长不能同时为 0`;
+    }
+  }
+  return null;
+}
+export function newState(state: State | Record<string, any> | null): State {
+  const result = state ? new State(cloneDeep(state)) : new State();
+  // 兼容旧版后端未返回 waitHours 的数据
+  for (const rule of result.stageRules) { rule.waitHours = Number(rule.waitHours ?? 0) || 0; }
+  return result;
 }
-export function newState(state: State | Record<string, any> | null): State { return state ? new State(cloneDeep(state)) : new State(); }
 
 export const rules = {
   flowerCode: { required: true, trigger: ['blur', 'input'], message: '请输入花种编码' },