@ninkch/dsh-infinite-canvas 0.19.10 → 0.19.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/client.js +85 -25
  2. package/package.json +1 -1
package/client.js CHANGED
@@ -274,6 +274,25 @@ function revealCanvasInRight() {
274
274
  function isNodeNonOpenTarget(t) {
275
275
  return !!(t && typeof t.closest === 'function' && t.closest(NODE_NON_OPEN_SELECTOR));
276
276
  }
277
+ // 画布滚轮分流:输入区/整个下拉浮层总是保留原生行为;正文与清单只在真正溢出时放行。
278
+ // 否则画布根上的非 passive wheel 会抢先 preventDefault,文本/剧本节点没法滚。
279
+ const NATIVE_WHEEL_DIRECT_SELECTORS = ['textarea', 'input', 'select', '.dshic-composer', '.dshic-pick-menu'];
280
+ const NATIVE_WHEEL_SCROLL_SELECTORS = ['.dshic-scroll-preview', '.dshic-shot-list', '.dshic-pick-list'];
281
+ function wheelScrollTarget(t) {
282
+ if (!t || typeof t.closest !== 'function') return null;
283
+ for (const s of NATIVE_WHEEL_DIRECT_SELECTORS) {
284
+ const hit = t.closest(s);
285
+ if (hit) return hit;
286
+ }
287
+ for (const s of NATIVE_WHEEL_SCROLL_SELECTORS) {
288
+ const hit = t.closest(s);
289
+ if (!hit) continue;
290
+ const dy = Number(hit.scrollHeight) - Number(hit.clientHeight);
291
+ const dx = Number(hit.scrollWidth) - Number(hit.clientWidth);
292
+ return (dy > 1 || dx > 1) ? hit : null;
293
+ }
294
+ return null;
295
+ }
277
296
  // 允许多条入线的输入端口(参考图类),其余输入端口保持单线
278
297
  const MULTI_INPUT_PORTS = new Set(['ref', 'char', 'scene', 'prop']);
279
298
  // 分镜端口期望的资产分类(仅用于连接时的非阻断提示)
@@ -3332,6 +3351,15 @@ body[data-ds-dark-theme] .dshic-pick-menu{border-color:var(--dsw-alias-border-l2
3332
3351
  .dshic-pick-search{padding:7px;border-bottom:1px solid var(--dshic-line);flex:none;}
3333
3352
  .dshic-pick-search .dshic-input{height:26px;font-size:12px;}
3334
3353
  .dshic-pick-list{overflow-y:auto;padding:5px;flex:1;}
3354
+ /* 下拉 / 文本正文 / 分镜清单:滚动条必须可见且可命中;不能用系统默认的淡细条。
3355
+ 12px 命中宽 + 3px 透明内边 + 32px 最短 thumb:视觉约 6px,命中区域明显更大。 */
3356
+ .dshic-pick-list,.dshic-scroll-preview,.dshic-shot-list{scrollbar-width:thin;scrollbar-color:var(--dsw-alias-border-l2) transparent;}
3357
+ .dshic-pick-list::-webkit-scrollbar,.dshic-scroll-preview::-webkit-scrollbar,.dshic-shot-list::-webkit-scrollbar{width:12px;height:12px;}
3358
+ .dshic-pick-list::-webkit-scrollbar-track,.dshic-scroll-preview::-webkit-scrollbar-track,.dshic-shot-list::-webkit-scrollbar-track{background:color-mix(in srgb,var(--dsw-alias-label-primary) 6%,transparent);border-radius:999px;}
3359
+ .dshic-pick-list::-webkit-scrollbar-thumb,.dshic-scroll-preview::-webkit-scrollbar-thumb,.dshic-shot-list::-webkit-scrollbar-thumb{background:var(--dsw-alias-border-l2);border:3px solid transparent;background-clip:padding-box;border-radius:999px;min-height:32px;min-width:32px;}
3360
+ .dshic-pick-list::-webkit-scrollbar-thumb:hover,.dshic-scroll-preview::-webkit-scrollbar-thumb:hover,.dshic-shot-list::-webkit-scrollbar-thumb:hover{background:var(--dsw-alias-brand-primary);border:3px solid transparent;background-clip:padding-box;}
3361
+ /* 下拉打开期间只暂停节点尺寸把手:防止菜单/滚动条边缘误触发底层拉宽箭头。 */
3362
+ body[data-dshic-pick-open] .dshic-rs{pointer-events:none;}
3335
3363
  /* 自定义数值输入:下拉底部的固定行;不参与列表滚动,Enter/失焦提交 */
3336
3364
  .dshic-pick-custom{padding:7px;border-top:1px solid var(--dshic-line);flex:none;}
3337
3365
  .dshic-pick-custom .dshic-input{width:100%;height:26px;font-size:12px;box-sizing:border-box;}
@@ -9821,6 +9849,9 @@ function queueThumb(assetId) {
9821
9849
  const durationPlan = videoDurationFor(n, shotList, !!sbUp);
9822
9850
  const autoDuration = durationPlan.value || 5;
9823
9851
  const handWritten = String(n.data.prompt || '').trim();
9852
+ // 手写厂商结构化提示词 = 高级直通路径:保留用户的 subject/shot 结构,
9853
+ // 只补实体设定文字;风格锁与承接前置块都不再追加,避免污染厂商协议格式。
9854
+ const handStructured = handWritten.includes('subject_definitions');
9824
9855
  // 分镜衔接规划:段落类型(续帧/换场/新角色/特写插入)+ 首镜承接口 + 是否接力尾帧
9825
9856
  const zh = effLang() !== 'en';
9826
9857
  const plan = (() => {
@@ -9896,10 +9927,9 @@ function queueThumb(assetId) {
9896
9927
  let p;
9897
9928
  // 图1=尾帧(降级模式)时实体参考图为图2..N+1:两条提示词组装路径都要同步偏移
9898
9929
  const effOpts = { picOffset: (useFrame && anchorRole === 'reference_image') ? 1 : 0 };
9899
- if (handWritten.includes('subject_definitions')) {
9900
- p = handWritten; // 高级用法:手写结构化提示词,原样发送
9901
- // 手写结构化提示词也要注入 @实体@ 的设定文字(外观/声音)——缺陷 3 的第三条路径。
9902
- // 只追加 series_bible 文字块:不动用户写好的主体/镜头结构,也不追加任何参考图。
9930
+ if (handStructured) {
9931
+ p = handWritten; // 高级用法:手写结构化提示词,结构原样保留
9932
+ // 只追加 series_bible 文字块:不动用户写好的主体/镜头结构,也不追加任何参考图与风格锁。
9903
9933
  if (!/series_bible/i.test(p)) {
9904
9934
  const bb = entityBibleBlock(entities, bible, zh);
9905
9935
  if (bb) p = p + '\n' + bb;
@@ -9915,15 +9945,17 @@ function queueThumb(assetId) {
9915
9945
  p = buildEffectivePrompt(prompt, refs, entities, bible, false, effOpts);
9916
9946
  }
9917
9947
  // 非结构化路径(无参考图/手写提示词)也要有首帧锚定与承接说明
9918
- if (!shotList.length || !p.includes('subject_definitions')) {
9948
+ if ((!shotList.length || !p.includes('subject_definitions')) && !handStructured) {
9919
9949
  const pre = [frameAnchorText({ hasFrame: useFrame, role: anchorRole, zh }), continuity].filter(Boolean).join(zh ? ';' : '; ');
9920
9950
  if (pre) p = pre + '\n' + p;
9921
9951
  }
9922
- // 技能包的「镜头语言锁」:附在末尾(结构化提示词也能拿到风格参数与负向词,且不打断它的字段顺序)
9923
- try {
9924
- const lock = await buildShotLockText('prompt');
9925
- if (lock) p = p + '\n' + lock;
9926
- } catch { /* 技能包不可用时不影响生成 */ }
9952
+ // 自动组装路径才追加技能包风格锁;手写厂商结构化提示词保持用户协议结构
9953
+ if (!handStructured) {
9954
+ try {
9955
+ const lock = await buildShotLockText('prompt');
9956
+ if (lock) p = p + '\n' + lock;
9957
+ } catch { /* 技能包不可用时不影响生成 */ }
9958
+ }
9927
9959
  const mcfg = resolveVideoModelCfg(settings, nodeVideoModelRef(n));
9928
9960
  if (!mcfg) throw new Error(T('errNoVideoModel'));
9929
9961
  if (sbUp && !durationPlan.value) addWarn('已连接分镜但暂无镜头时长:视频时长回退 5s(先生成分镜镜头后重跑)');
@@ -11346,6 +11378,9 @@ function queueThumb(assetId) {
11346
11378
  };
11347
11379
  useEffect(() => {
11348
11380
  if (!open) return undefined;
11381
+ // 下拉打开期间挂 body 标记:只禁用节点尺寸把手,不禁用节点本体,
11382
+ // 否则滚动条/菜单边缘的鼠标会先命中底层“拉宽箭头”。
11383
+ document.body.dataset.dshicPickOpen = '1';
11349
11384
  const onDown = (e) => {
11350
11385
  const t = e && e.target;
11351
11386
  if (menuRef.current && t && menuRef.current.contains && menuRef.current.contains(t)) return;
@@ -11353,7 +11388,10 @@ function queueThumb(assetId) {
11353
11388
  setOpen(false);
11354
11389
  };
11355
11390
  document.addEventListener('pointerdown', onDown, true);
11356
- return () => document.removeEventListener('pointerdown', onDown, true);
11391
+ return () => {
11392
+ delete document.body.dataset.dshicPickOpen;
11393
+ document.removeEventListener('pointerdown', onDown, true);
11394
+ };
11357
11395
  }, [open]);
11358
11396
  const cur = options.find((o) => String(o.value) === String(value));
11359
11397
  // 自定义值不在预设里时,按钮显示真实当前值(绝不能错显第一项,否则用户以为没生效)
@@ -14069,7 +14107,7 @@ function queueThumb(assetId) {
14069
14107
 
14070
14108
  async function buildShotLockText(kind, opts) {
14071
14109
  const medium = (opts && opts.medium) || 'video';
14072
- const pid = S.activeId;
14110
+ const pid = (opts && opts.pid) || S.activeId;
14073
14111
  if (!pid) return '';
14074
14112
  const manifest = await loadPackManifest();
14075
14113
  if (!manifest) return '';
@@ -14086,6 +14124,16 @@ function queueThumb(assetId) {
14086
14124
  const b = String(body || '').trim();
14087
14125
  if (b) parts.push(label + '\n' + b);
14088
14126
  };
14127
+ // 负向词跨四层全局收集:单卡内去重不够——导演/题材/规格/影调经常重复同类禁令,
14128
+ // 重复注入会稀释权重。统一去重后再给总预算,防止异常卡把视频请求撑成负向词文本墙。
14129
+ const negs = [];
14130
+ const seenNeg = new Set();
14131
+ const addNegs = (phrases) => {
14132
+ for (const raw of (phrases || [])) {
14133
+ const s = String(raw || '').trim();
14134
+ if (s && !seenNeg.has(s.toLowerCase())) { seenNeg.add(s.toLowerCase()); negs.push(s); }
14135
+ }
14136
+ };
14089
14137
 
14090
14138
  // ① 导演透镜:风格参数 YAML(机读、可核对)+ 灯光与色彩(成型规则)
14091
14139
  const lensEntry = profile.lens ? (manifest.lenses || []).find((x) => x.id === profile.lens) : null;
@@ -14123,9 +14171,8 @@ function queueThumb(assetId) {
14123
14171
  // 以前只在 script 切片里出现、进不了 prompt,等于题材对成片没有约束力。这里补上。
14124
14172
  const forbid = P.sectionText(md, '禁止漂移');
14125
14173
  if (forbid) push('本题材的画面禁项(' + entry.name + ',必须排除):', forbid);
14126
- // 题材级负向词(与规格/透镜/影调同一机制):题材卡若写了「类型级负向词」小节就一并注入。
14127
- const genreNeg = P.negativePhrases(md);
14128
- if (genreNeg.length) push('本题材负向词(' + entry.name + ',必须排除):', genreNeg.join(', '));
14174
+ // 题材级负向词与其它层合并,统一去重后在块尾注入
14175
+ addNegs(P.negativePhrases(md));
14129
14176
  }
14130
14177
 
14131
14178
  // ④ 规格:节奏与负向词(画幅不在这里定,由视频节点选)
@@ -14138,24 +14185,36 @@ function queueThumb(assetId) {
14138
14185
  if (spec.asl_floor_s) bits.push('单镜不短于 ' + spec.asl_floor_s + 's');
14139
14186
  if (spec.asl_target_s) bits.push('平均镜长 ' + spec.asl_target_s + 's');
14140
14187
  if (bits.length) push('交付规格(' + formEntry.name + '):', bits.join(';'));
14141
- const neg = P.negativePhrases(md);
14142
- if (neg.length) push('本类型负向词(必须排除):', neg.join(', '));
14188
+ addNegs(P.negativePhrases(md));
14143
14189
  }
14144
14190
  }
14145
14191
 
14146
- // ⑤ 透镜与影调各自的负向词(两处规格不同,都要)
14147
- for (const [layer, label] of [['lens', '镜头负向词'], ['look', '画质负向词']]) {
14192
+ // ⑤ 透镜与影调负向词:和题材/规格合并,块尾统一注入
14193
+ for (const layer of ['lens', 'look']) {
14148
14194
  const id = layer === 'lens' ? profile.lens : profile.look;
14149
14195
  const entry = id ? (manifest[layer === 'lens' ? 'lenses' : 'looks'] || []).find((x) => x.id === id) : null;
14150
14196
  if (!entry) continue;
14151
14197
  const md = await readPackCard(layer, entry.file);
14152
14198
  if (!md) continue;
14153
- const neg = P.negativePhrases(md);
14154
- if (neg.length) push(label + '(必须排除):', neg.join(', '));
14199
+ addNegs(P.negativePhrases(md));
14200
+ }
14201
+
14202
+ if (negs.length) {
14203
+ // 预算按 UTF-8 字节计算(pack.js 的 utf8Bytes 与浏览器/Node 同口径);逗号分隔符也计入。
14204
+ // 超过预算的尾部短语直接截掉,不做半句截断——截半条负向词可能反转语义。
14205
+ const kept = [];
14206
+ let bytes = 0;
14207
+ for (const s of negs) {
14208
+ const need = P.utf8Bytes(s) + (kept.length ? 2 : 0);
14209
+ if (!need || bytes + need > 2400) continue;
14210
+ kept.push(s);
14211
+ bytes += need;
14212
+ }
14213
+ if (kept.length) push('全局负向词(必须排除):', kept.join(', '));
14155
14214
  }
14156
14215
 
14157
14216
  if (!parts.length) return '';
14158
- const head = '[风格增强锁] 以下三块直接决定画面成败,与提示词正文冲突时以本块为准:';
14217
+ const head = '[风格增强锁] 以下分块直接决定画面成败,与提示词正文冲突时以本块为准:';
14159
14218
  return head + '\n' + parts.join('\n\n');
14160
14219
  }
14161
14220
 
@@ -19300,9 +19359,9 @@ const DIRECTOR_KEY_HELP = [
19300
19359
  const el = rootRef.current;
19301
19360
  if (!el) return;
19302
19361
  const fn = (e) => {
19303
- // 文本/下拉等交互区域与生成面板保持原生滚动,不缩放画布
19304
- const t = e.target;
19305
- if (t && t.closest && t.closest('textarea, input, select, .dshic-shot-list, .dshic-composer')) return;
19362
+ // 输入区/生成面板/下拉菜单保持原生行为;正文与清单只在确实可滚时放行。
19363
+ // 这样短文本不会把滚轮抢走,画布仍可在节点空白/短内容上缩放。
19364
+ if (wheelScrollTarget(e.target)) return;
19306
19365
  e.preventDefault();
19307
19366
  const rect = el.getBoundingClientRect();
19308
19367
  const sx = e.clientX - rect.left, sy = e.clientY - rect.top;
@@ -19908,6 +19967,7 @@ const DIRECTOR_KEY_HELP = [
19908
19967
  sizeForRatio, nodeSizeForRatio, mediaBarsHeight, mediaHasFooter,
19909
19968
  ratioIsValid, ratioAspect, ratioFromDims, mediaRatioOf, mediaAspectOf, mediaRatioForDims,
19910
19969
  normalizeMediaNodeSize, normalizeGraphDoc, resizeBoxFor, composerWidthFor,
19970
+ wheelScrollTarget,
19911
19971
  // 下拉自定义数值的纯函数:范围夹取 / 整数与小数口径(分镜数、单段上限共用)
19912
19972
  clampCustomNumber,
19913
19973
  // 视频请求时长策略:手动秒数 vs 分镜节拍(供面板禁用态与请求侧共用)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ninkch/dsh-infinite-canvas",
3
- "version": "0.19.10",
3
+ "version": "0.19.11",
4
4
  "description": "无限画布(Infinite Canvas)for DeepSeek Harness:节点式创作工作室(剧本/分镜/生成/成片),内置「媒体创作」预设模式(导演第一视角 + 引导工作坊)。Version-agnostic: reads the live catalog from the installed package at load time.",
5
5
  "keywords": [
6
6
  "dsh",