weaver-e10-builder 1.0.10-beta → 1.0.12-beta

package/dist/commands/form-serial-mark.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-serial-mark.js","sourceRoot":"","sources":["../../src/commands/form-serial-mark.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form-serial-mark.js","sourceRoot":"","sources":["../../src/commands/form-serial-mark.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAG9C;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,MAAM,OAAO,GAAG,oCAAoC,CAAC;AACrD,MAAM,OAAO,GAAG,6CAA6C,CAAC;AAE9D,2DAA2D;AAE3D,uDAAuD;AACvD,KAAK,UAAU,WAAW,CAAC,MAAiB,EAAE,OAAe,EAAE,KAAa;IAC1E,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,OAAO,2BAA2B,KAAK,EAAE,CAAC,CAAC;IACrF,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,aAAa,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;IAC5D,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,2DAA2D;AAC3D,KAAK,UAAU,iBAAiB,CAAC,MAAiB,EAAE,OAAe,EAAE,QAAgB;IACnF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,OAAO,sCAAsC,QAAQ,EAAE,CAAC,CAAC;IACnG,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC;IAC5D,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;IACjE,OAAO,KAAK,CAAC;AACf,CAAC;AAED,kEAAkE;AAClE,KAAK,UAAU,WAAW,CAAC,MAAiB,EAAE,OAAe,EAAE,QAAgB;IAC7E,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC1E,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,OAAO,4BAA4B,EAAE;QAC9E,KAAK,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc;QAChE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC;QACvE,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ;KACxC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;IACrD,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,aAAa,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;IACnE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,mCAAmC;AACnC,KAAK,UAAU,WAAW,CAAC,MAAiB,EAAE,OAAe,EAAE,KAAa,EAAE,KAAa;IACzF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,OAAO,2BAA2B,KAAK,SAAS,KAAK,kBAAkB,CAAC,CAAC;IACnH,OAAO,GAAG,EAAE,IAAI,EAAE,WAAW,IAAI,EAAE,CAAC;AACtC,CAAC;AAED,8BAA8B;AAC9B,KAAK,UAAU,kBAAkB,CAAC,MAAiB,EAAE,OAAe,EAAE,KAAa,EAAE,KAAa,EAAE,OAAe;IACjH,MAAM,QAAQ,GAAG,CAAC,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAChE,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IACjE,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,IAAI,eAAe,EAAE,CAAC;QAChC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,GAAG,OAAO,gCAAgC,KAAK,UAAU,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClH,CAAC;IACD,OAAO,QAAQ,CAAC,MAAM,CAAC;AACzB,CAAC;AAED,0CAA0C;AAC1C,KAAK,UAAU,SAAS,CACtB,MAAiB,EAAE,OAAe,EAAE,KAAa,EAAE,KAAa,EAChE,OAAe,EAAE,QAAgB,EAAE,SAAS,GAAG,EAAE;IAEjD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,OAAO,sBAAsB,KAAK,UAAU,KAAK,EAAE,EAAE;QAC9F,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ;QACpD,eAAe,EAAE,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;KAC9E,CAAC,CAAC;IACH,IAAI,GAAG,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;AAC1F,CAAC;AAED,sCAAsC;AACtC,KAAK,UAAU,YAAY,CAAC,MAAiB,EAAE,OAAe,EAAE,SAAiB,EAAE,QAAgB;IACjG,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,OAAO,8CAA8C,SAAS,eAAe,QAAQ,EAAE,CAAC,CAAC;IACnI,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;AAC/B,CAAC;AAED,iDAAiD;AACjD,SAAS,OAAO,CAAC,GAAQ,EAAE,QAAgB,EAAE,SAAiB;IAC5D,MAAM,EAAE,GAAQ,EAAE,GAAG,GAAG,EAAE,CAAC;IAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC;QAAE,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzE,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAC/B,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,MAAM;QAAE,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC;SAC5C,IAAI,EAAE,CAAC,QAAQ,KAAK,SAAS,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,OAAO,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI;QAAE,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC;IAChH,EAAE,CAAC,UAAU,GAAG,QAAQ,CAAC;IACzB,EAAE,CAAC,SAAS,GAAG,SAAS,CAAC;IACzB,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,6CAA6C;AAC7C,KAAK,UAAU,UAAU,CACvB,MAAiB,EAAE,OAAe,EAClC,MAA8B,EAAE,QAAgB;IAEhD,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC;QAC7B,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI;QACtE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI;QACzE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,oBAAoB,EAAE,EAAE;QAC9D,gBAAgB,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,QAAQ;KACzD,CAAC,CAAC,QAAQ,EAAE,CAAC;IACd,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,OAAO,kCAAkC,EAAE,EAAE,CAAC,CAAC;IACzF,MAAM,GAAG,GAAG,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,GAAG,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,aAAa,GAAG,EAAE,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;IACnE,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACnB,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC;IAAC,GAAG,CAAC,SAAS,GAAG,EAAE,CAAC;IAC9C,OAAO,GAAG,CAAC;AACb,CAAC;AAED,0BAA0B;AAC1B,KAAK,UAAU,SAAS,CACtB,MAAiB,EAAE,OAAe,EAAE,WAAmB,EACvD,QAAgB,EAAE,SAAiB,EAAE,KAAa;IAElD,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE;QAC5C,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW;QACpE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG;KAC5D,EAAE,QAAQ,CAAC,CAAC;IACb,GAAG,CAAC,cAAc,GAAG,KAAK,CAAC;IAAC,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;IACtD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,sEAAsE;AACtE,KAAK,UAAU,WAAW,CACxB,MAAiB,EAAE,OAAe,EAAE,OAAe,EACnD,QAAgB,EAAE,SAAiB;IAEnC,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE;QAC5C,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO;QAC9D,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG;KAC5D,EAAE,QAAQ,CAAC,CAAC;IACb,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;IAC1B,OAAO,GAAG,CAAC;AACb,CAAC;AAED,4EAA4E;AAC5E,KAAK,UAAU,YAAY,CACzB,MAAiB,EAAE,OAAe,EAAE,WAAmB,EACvD,QAAgB,EAAE,SAAiB,EAAE,WAAmB;IAExD,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE;QAC5C,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW;QACrE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW;KACvD,EAAE,QAAQ,CAAC,CAAC;IACb,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;IAC1B,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;8DAE8D;AAC9D,KAAK,UAAU,cAAc,CAC3B,MAAiB,EAAE,OAAe,EAAE,KAAa,EAAE,KAAa,EAAE,OAAe,EACjF,SAAkB;IAElB,MAAM,QAAQ,GAAG,CAAC,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAChE,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IACjE,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC;YAAC,SAAS,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;QACpG,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC1D,CAAC;IACD,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAC5B,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/D,MAAM,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;IACtE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;AAChD,CAAC;AAED,qDAAqD;AACrD,KAAK,UAAU,YAAY,CACzB,MAAiB,EAAE,OAAe,EAAE,QAAgB,EAAE,SAAiB,EACvE,UAAiB,EAAE,YAAsB,EAAE;IAE3C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,OAAO,0BAA0B,EAAE;QAC5E,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS;KACvD,CAAC,CAAC;IACH,IAAI,GAAG,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,aAAa,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;AAC5F,CAAC;AAED,+BAA+B;AAC/B,KAAK,UAAU,aAAa,CAC1B,MAAiB,EAAE,OAAe,EAAE,SAAiB,EAAE,QAAgB,EAAE,OAAe;IAExF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,OAAO,gDAAgD,EAAE;QAClG,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO;KACpE,CAAC,CAAC;IACH,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;AAC/B,CAAC;AAED,WAAW;AACX,KAAK,UAAU,cAAc,CAAC,MAAiB,EAAE,OAAe,EAAE,IAAW;IAC3E,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,OAAO,wCAAwC,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5H,IAAI,GAAG,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;AAC1F,CAAC;AAED,eAAe;AACf,MAAM,cAAc,GAA2B;IAC7C,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,OAAO;IAC3D,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG;IACxE,IAAI,EAAE,IAAI;CACX,CAAC;AAEF;qCACqC;AACrC,KAAK,UAAU,YAAY,CACzB,GAAQ,EAAE,MAAiB,EAAE,OAAe,EAAE,YAAoB,EAClE,QAAgB,EAAE,SAAiB,EAAE,SAA6B;IAElE,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,OAAO;YACV,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS;gBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAChE,OAAO,MAAM,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;QAChG,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;YACnC,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAClD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC9C,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,sBAAsB;YACzE,uDAAuD;YACvD,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3C,OAAO,GAAG,CAAC;QACb,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,GAAG,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;YACvC,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAClD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC9C,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC7C,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU;YACrD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACvD,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YACzF,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;YACrB,OAAO,GAAG,CAAC;QACb,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,GAAG,GAAG,CAAC,WAAW,KAAK,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,kBAAkB;YAC7E,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YACvF,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;YACrB,OAAO,GAAG,CAAC;QACb,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC;YACnE,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE;gBAC5C,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY;gBACnE,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG;aAC/E,EAAE,QAAQ,CAAC,CAAC;YACb,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;YAC1B,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;YACrB,OAAO,GAAG,CAAC;QACb,CAAC;QACD;YACE,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,CAAC,IAAI,uCAAuC,CAAC,CAAC;IACjF,CAAC;AACH,CAAC;AAED,iBAAiB;AACjB,SAAS,OAAO,CAAC,GAAQ;IACvB,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,OAAO,CAAC,CAAC,OAAO,MAAM,GAAG,CAAC,KAAK,GAAG,CAAC;QACxC,KAAK,MAAM,CAAC,CAAC,OAAO,KAAK,GAAG,CAAC,MAAM,IAAI,MAAM,GAAG,CAAC;QACjD,KAAK,QAAQ,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAClF,KAAK,OAAO,CAAC,CAAC,OAAO,MAAM,GAAG,CAAC,OAAO,GAAG,CAAC;QAC1C,KAAK,QAAQ,CAAC,CAAC,OAAO,GAAG,CAAC,WAAW,KAAK,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;QAC3E,KAAK,MAAM,CAAC,CAAC,OAAO,MAAM,GAAG,CAAC,MAAM,IAAI,UAAU,GAAG,CAAC;QACtD,OAAO,CAAC,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,0DAA0D;AAE1D,MAAM,UAAU,8BAA8B,CAAC,IAAa,EAAE,OAAgB;IAC5E,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;SACnC,WAAW,CAAC,yCAAyC,CAAC,CAAC;IAE1D,2DAA2D;IAE3D,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,yBAAyB,CAAC;SACtC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;SAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5B,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,KAAa,EAAE,EAAE;QAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAAC,OAAO;QAAC,CAAC;QAEvD,MAAM,GAAG,GAAU,EAAE,CAAC;QACtB,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACpC,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC;YAClC,IAAI,SAAS,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC;gBAAC,SAAS,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;YACpG,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvF,MAAM,OAAO,GAAU,IAAI;iBACxB,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;iBAC/D,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;gBAChB,IAAI,EAAE,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,aAAa;gBAChF,KAAK,EAAE,CAAC,CAAC,cAAc,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACpF,CAAC,CAAC,CAAC;YACN,oBAAoB;YACpB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC1B,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,IAAI,SAAS,EAAE,CAAC;oBAC3C,IAAI,CAAC;wBACH,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;wBAC3F,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC/F,CAAC;oBAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,QAAQ,IAAI,GAAG,eAAe,CAAC,CAAC,QAAQ,cAAc,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;gBACvG,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;oBAC3B,MAAM,GAAG,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvD,MAAM,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC;oBACtB,MAAM,OAAO,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBAC/E,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvC,MAAM,EAAE,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,GAAG,GAAG,GAAG,KAAK,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,oDAAoD;IAEpD,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,8DAA8D,CAAC;SAC3E,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;SAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5B,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;SACpC,cAAc,CAAC,mBAAmB,EAAE,0EAA0E,CAAC;SAC/G,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,KAAa,EAAE,OAAe,EAAE,OAA6B,EAAE,EAAE;QAC7F,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,IAAI,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC9B,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC5E,IAAI,OAAc,CAAC;QACnB,IAAI,CAAC;YAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QACvG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAEzG,+BAA+B;QAC/B,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/E,IAAI,CAAC,GAAG,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAC1D,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC;QAEpC,gDAAgD;QAChD,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC;QAE7E,MAAM,KAAK,GAAU,EAAE,CAAC;QACxB,MAAM,gBAAgB,GAA4D,EAAE,CAAC;QACrF,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,KAAK,CAAC,IAAI,CAAC,MAAM,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YAC9F,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;gBACzD,gBAAgB,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YAC9E,CAAC;QACH,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,CAAS,EAAE,EAAE,GAAG,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE1D,6CAA6C;QAC7C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvF,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5G,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAE3E,gCAAgC;QAChC,KAAK,MAAM,EAAE,IAAI,gBAAgB,EAAE,CAAC;YAClC,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;YACvF,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1E,MAAM,IAAI,GAAU,EAAE,CAAC;YACvB,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,KAAK,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACjC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;YACzH,CAAC;YACD,MAAM,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;YACnB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,gBAAgB,CAAC,MAAM,EAAE,CAAC;YAC9H,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,OAAO,IAAI,WAAW,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEL,wDAAwD;IAExD,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC;SACtB,WAAW,CAAC,uDAAuD,CAAC;SACpE,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;SAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5B,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;SACpC,cAAc,CAAC,eAAe,EAAE,0DAA0D,CAAC;SAC3F,MAAM,CAAC,iBAAiB,EAAE,oDAAoD,CAAC;SAC/E,MAAM,CAAC,wBAAwB,EAAE,4DAA4D,CAAC;SAC9F,MAAM,CAAC,gBAAgB,EAAE,uBAAuB,CAAC;SACjD,MAAM,CAAC,qBAAqB,EAAE,yDAAyD,EAAE,UAAU,CAAC;SACpG,MAAM,CAAC,gBAAgB,EAAE,8CAA8C,EAAE,SAAS,CAAC;SACnF,MAAM,CAAC,SAAS,EAAE,sBAAsB,CAAC;SACzC,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;SAC5C,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,KAAa,EAAE,OAAe,EAAE,OAG7D,EAAE,EAAE;QACH,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,qCAAqC;QACrC,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/E,IAAI,CAAC,GAAG,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAC1D,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC;QAEpC,kBAAkB;QAClB,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAE3F,IAAI,MAAW,CAAC;QAChB,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBAAC,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAAC,CAAC;YACrF,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACpF,CAAC;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,KAAK,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YAC9D,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACjF,CAAC;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACnC,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC;YAC3E,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE;gBACzC,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO;gBAC9D,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG;aAC/E,EAAE,QAAQ,CAAC,CAAC;YACb,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QAC/B,CAAC;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACpC,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAAC,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAAC,CAAC;YAC7F,MAAM,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACzF,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,cAAc,OAAO,CAAC,IAAI,2BAA2B,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACxF,CAAC;QAED,WAAW;QACX,MAAM,CAAC,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAExC,wBAAwB;QACxB,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;QACzE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEpB,uBAAuB;QACvB,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAChG,sCAAsC;QACtC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QACD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,CAAS,EAAE,EAAE,GAAG,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE3D,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAErE,OAAO;QACP,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;YACnB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;YACzF,CAAC,CAAC,OAAO,OAAO,CAAC,IAAI,aAAa,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEL,sDAAsD;IAEtD,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAEzE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,aAAa,CAAC;SAC1B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;SAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5B,QAAQ,CAAC,WAAW,EAAE,4BAA4B,CAAC;SACnD,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,KAAa,EAAE,OAAe,EAAE,EAAE;QAC9D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,sDAAsD;QACtD,8CAA8C;QAC9C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC;YAAC,SAAS,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QACzE,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChF,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,OAAO,CAAC,CAAC;YACrC,KAAK,MAAM,CAAC,IAAI,IAAI;gBAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,SAAS,CAAC,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC,CAAC;QAChF,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,0DAA0D,CAAC;SACvE,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;SAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5B,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;SAChC,cAAc,CAAC,cAAc,EAAE,uCAAuC,CAAC;SACvE,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,KAAa,EAAE,OAAe,EAAE,OAAwB,EAAE,EAAE;QACxF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,OAAO;QACP,IAAI,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;QACzB,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC5E,MAAM,GAAG,GAA2B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEvD,+DAA+D;QAC/D,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC;YAAC,SAAS,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACpF,mCAAmC;QACnC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAU,EAAE,CAAC;QACvB,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC;gBACR,QAAQ,EAAE,SAAS,EAAE,IAAI;gBACzB,UAAU,EAAE,GAAG,EAAE,UAAU,IAAI,EAAE;gBACjC,OAAO;gBACP,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,MAAM,EAAE;aACxB,CAAC,CAAC;QACL,CAAC;QACD,MAAM,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;YACnB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;YACrD,CAAC,CAAC,OAAO,IAAI,CAAC,MAAM,SAAS,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEL,qDAAqD;IAErD,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,eAAe,CAAC;SAC5B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;SAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5B,MAAM,CAAC,0BAA0B,EAAE,qBAAqB,CAAC;SACzD,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,KAAa,EAAE,OAAiC,EAAE,EAAE;QAChF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC;QAC3D,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,OAAO,oBAAoB,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC1F,MAAM,MAAM,GAAG,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC;QAC/B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,MAAM,UAAU,CAAC,CAAC;YAC1C,KAAK,MAAM,CAAC,IAAI,MAAM;gBAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,QAAQ,MAAM,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;QACjG,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,uDAAuD;IAEvD,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,YAAY,CAAC;SACzB,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;SAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,KAAa,EAAE,OAAe,EAAE,EAAE;QAC9D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,MAAM,QAAQ,GAAG,CAAC,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;aAChE,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAC7E,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,IAAI,eAAe,EAAE,CAAC;YAChC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3B,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,GAAG,OAAO,gCAAgC,KAAK,UAAU,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClH,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;YACnB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACtE,CAAC,CAAC,SAAS,OAAO,UAAU,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/commands/form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../src/commands/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2CpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAitF9D"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../src/commands/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2CpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAk1F9D"}

package/dist/commands/form.js

@@ -891,6 +891,97 @@ export function registerFormCommands(program) {
                 }
             }
         }
+        // Step 5b: 明细表子字段 Employee/Department 的 isSingle —— 对齐主表 Step 5。
+        // 之前 Step 5 只过滤顶层 fieldDefs，DetailTable.formFields 里的人员/部门字段漏处理
+        // → 明细表 Employee 平台默认 multiSelect:true（多选），与主表（默认单选）相反。
+        // 复用 Step 7b 的子字段 save 模式：getFields(isReturnDetail) 建 subFieldMap + getFormLayout 取
+        // subFormTableId，getFormField 读全量→patch isSingle→saveFormFieldNew 带 subFormId（防最小 jsonObj 覆盖破坏）。
+        const detailPersonDefs = fieldDefs
+            .filter(f => f.componentKey === 'DetailTable' && Array.isArray(f.formFields))
+            .flatMap(dt => (dt.formFields || [])
+            .filter(sf => sf.componentKey === 'Employee' || sf.componentKey === 'Department')
+            .map(sf => ({ ...sf, __detailTable: dt.fieldName })));
+        if (detailPersonDefs.length > 0) {
+            const withDefault = detailPersonDefs.filter(sf => sf.defaultValue === true);
+            console.error(`  配置 ${detailPersonDefs.length} 个 明细人员/部门 子字段 isSingle${withDefault.length ? `（其中 ${withDefault.length} 个带默认当前用户/部门）` : ''}...`);
+            await resolveFormId();
+            // 1. getFields(isReturnDetail='y') 建 subFieldMap（dtName/fieldName → fieldId/subFormId）；子表 formTableId 从布局取
+            let subFieldMap = new Map();
+            let subFormTableId = '';
+            try {
+                const dfRes = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                    objId, userid: auth.userId, tenantKey: auth.tenantKey, isReturnDetail: 'y',
+                });
+                for (const dt of (dfRes?.data?.detailFields || [])) {
+                    const dtName = dt.name || dt.subFormName || '';
+                    for (const sf of (dt.fields || []))
+                        subFieldMap.set(`${dtName}/${sf.fieldName}`, sf);
+                }
+                const layoutRes = await client.post(`${baseUrl}/api/ebuilder/form/builder/getFormLayout`, {
+                    formId: resolvedFormId, module: 'ebuilderform', customParam: {}, formTableIdList: [],
+                    designerParam: { onlyLayout: false, convert: false }, form: { id: resolvedFormId },
+                }, { ebbusinessid: resolvedFormId });
+                const pages = (layoutRes?.data?.formLayoutMultiple?.pageLayouts || layoutRes?.data?.formLayout?.pageLayouts || []);
+                for (const p of pages) {
+                    for (const c of (p.comps || [])) {
+                        if (String(c.type) === 'DetailTable')
+                            subFormTableId = c.config?.formTableId || '';
+                    }
+                }
+            }
+            catch { /* 拿不到就跳过 */ }
+            for (const sfDef of detailPersonDefs) {
+                try {
+                    const sf = subFieldMap.get(`${sfDef.__detailTable}/${sfDef.fieldName}`);
+                    if (!sf) {
+                        console.error(`    ⚠ 未找到明细子字段: ${sfDef.__detailTable}.${sfDef.fieldName}`);
+                        continue;
+                    }
+                    const subFieldId = String(sf.fieldId);
+                    const subFormId = String(sf.subFormId || '');
+                    // 读子字段全量配置（保留列名等，防最小 jsonObj 覆盖破坏；对齐 Step 7b/Step 8 保护模式）
+                    const gf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, {
+                        module: 'ebuilderform',
+                        formTableField: { formField: { id: subFieldId, form: { id: resolvedFormId } } },
+                    }, { ebbusinessid: resolvedFormId });
+                    const cur = gf?.data || {};
+                    if (!cur?.fieldId) {
+                        console.error(`    ⚠ 未读到子字段 ${sfDef.fieldName}（fieldId=${subFieldId}），跳过 isSingle 配置`);
+                        continue;
+                    }
+                    const isDept = sfDef.componentKey === 'Department';
+                    const typeLabel = isDept ? 'Department' : 'Employee';
+                    const labelCN = isDept ? '部门' : '人员';
+                    // spread cur 全量（保留子字段所有结构，防最小 jsonObj 覆盖破坏）+ 设 isSingle。
+                    // 子字段单/多选由布局 comp 的 isSingle 控制（实测：getFields 的 multiSelect 是 dataset 元数据，
+                    // 不控制渲染；布局 comp isSingle 才是渲染源）。saveFormFieldNew 会同步更新布局 comp 的 isSingle。
+                    const jsonObj = {
+                        ...cur,
+                        type: typeLabel,
+                        title: sfDef.fieldName,
+                        isSingle: sfDef.multiple ? false : true,
+                        formTableId: subFormTableId || cur.formTableId || '',
+                        subFormId,
+                        formId: resolvedFormId,
+                        groupId: '-1',
+                    };
+                    // 默认当前用户/部门仅 fields.json defaultValue:true 时配（与主表一致）
+                    if (sfDef.defaultValue === true) {
+                        jsonObj.defaultExtend = { type: 'current', relation: 'current', virtualId: '1' };
+                    }
+                    const updateRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, { formId: resolvedFormId, module: 'ebuilderform', customParam: { appId, objId }, jsonObj: JSON.stringify(jsonObj) }, { ebbusinessid: resolvedFormId });
+                    if (updateRes?.code === 200 && updateRes?.status) {
+                        console.error(`    已配置: 明细子字段 ${sfDef.fieldName} isSingle=${sfDef.multiple ? false : true}${sfDef.defaultValue === true ? ` + 默认当前${labelCN}` : ''}`);
+                    }
+                    else {
+                        console.error(`    配置失败: 明细子字段 ${sfDef.fieldName} — ${updateRes?.msg || '未知错误'}`);
+                    }
+                }
+                catch (e) {
+                    console.error(`    配置异常: 明细子字段 ${sfDef.fieldName} — ${e.message}`);
+                }
+            }
+        }
         // Step 6: Configure Date/DateTime fields with default current date.
         // DateTime 日期-时间：format 带时间，时间默认时:分（yyyy-MM-dd HH:mm 不含秒）。
         const dateFields = fieldDefs.filter(f => f.componentKey === 'Date' || f.componentKey === 'DateTime');
@@ -2121,11 +2212,17 @@ export function registerFormCommands(program) {
                     // 否则任何 add-field 新字段（Text/Employee/EBuilder 都中招）默认不可编辑。
                     ...(String(c.id) === String(fieldId) ? { readOnly: false } : {}),
                 }));
+                // DetailTable 置末（对齐 form create / form layout init）：getConfig 可能把明细表夹中间，
+                // 重排避免明细跑到普通字段上面。
+                const orderedConfigs = [
+                    ...configs.filter((c) => c.type !== 'DetailTable' && c.componentKey !== 'DataTable'),
+                    ...configs.filter((c) => c.type === 'DetailTable' || c.componentKey === 'DataTable'),
+                ];
                 await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/initLayout?apid=${appId}`, {
                     formId, module: 'ebuilderform', apiModule: 'ebuilder/form',
                     layoutId, generateCollapse: true,
                     styleTemplateId: layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008', styleTemplateType: 1,
-                    configs, addLayout: false, ecodeType: ['js', 'css'],
+                    configs: orderedConfigs, addLayout: false, ecodeType: ['js', 'css'],
                     initMode: '1', customParam: { terminal: '', objId: formId },
                     formLayoutMultiple: { isSys: true, id: layoutMultiId, name: layoutName, terminalType: 'PC', layoutType },
                     designerParam: { onlyLayout: false },
@@ -2595,23 +2692,19 @@ export function registerFormCommands(program) {
                 }
                 created.push({ name: gname, groupId, refFieldId, fieldIds });
             }
-            // ③ 布局：对齐 form-create.ts EXCEL 分组路径——平铺 configs + 分组字段前置重排
-            // （分组字段 → 系统字段 → 未分组字段）+ generateCollapse:true + groupFieldIds=[]，
-            // 平台据 saveFieldGroup/updateFormFieldGroup 记录自动包 Collapse（eb 表 EXCEL 实测唯一生效方式）。
+            // ③ 布局：按 layoutType 分叉（对齐 form-create.ts 分组渲染）。
+            // EXCEL：平铺 + 分组字段前置重排 + generateCollapse:true + groupFieldIds=[]，
+            //        平台据 saveFieldGroup/updateFormFieldGroup 记录自动包 Collapse（EXCEL 实测唯一生效）。
+            // FLOW：generateCollapse 对流式**不生效**，改手动 Collapse config（id=refFieldId, Fold/Collapse,
+            //        children=分组字段）+ groupFieldIds=[各 refFieldId]（FLOW 实测唯一生效）。
             const cfgRes2 = await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/getConfig`, {
                 formId, module: 'ebuilderform', apiModule: 'ebuilder/form', layoutId,
                 customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: [],
                 designerParam: { sourceModule: 'ebuilderform' },
             }, ebb);
             const rawCfgs = cfgRes2?.data?.configs || [];
-            const groupFieldIdSet = new Set(created.flatMap((g) => g.fieldIds));
-            const ordered = [
-                ...rawCfgs.filter((c) => groupFieldIdSet.has(String(c.id))),
-                ...rawCfgs.filter((c) => c.system),
-                ...rawCfgs.filter((c) => !groupFieldIdSet.has(String(c.id)) && !c.system),
-            ];
-            const finalConfigs = ordered.map((c) => {
-                const isBusiness = !c.system && c.type !== 'DetailTable' && c.componentKey !== 'DataTable';
+            const normalize = (c) => {
+                const isBusiness = !c.system && c.type !== 'DetailTable' && c.componentKey !== 'DataTable' && c.type !== 'Collapse';
                 const out = { ...c, display: c.system ? c.display : true, show: c.system ? c.show : true };
                 if (isBusiness) {
                     out.readOnly = false;
@@ -2620,19 +2713,55 @@ export function registerFormCommands(program) {
                         out.required = true;
                 }
                 return out;
-            });
+            };
+            let finalConfigs;
+            const groupFieldIds = [];
+            if (layoutType === 'FLOW') {
+                const groupFieldIdSet = new Set(created.flatMap((g) => g.fieldIds));
+                const groupedCfgs = rawCfgs.filter((c) => groupFieldIdSet.has(String(c.id)));
+                const ungrouped = rawCfgs.filter((c) => !groupFieldIdSet.has(String(c.id)));
+                const collapses = [];
+                for (const grp of created) {
+                    if (!grp.refFieldId)
+                        continue;
+                    const children = groupedCfgs.filter((c) => grp.fieldIds.includes(String(c.id))).map(normalize);
+                    groupFieldIds.push(grp.refFieldId);
+                    collapses.push({
+                        id: grp.refFieldId, name: grp.name, componentKey: 'Fold', display: true, show: true,
+                        readOnly: true, required: false, disableEdit: false, singleRow: false, isDelete: false,
+                        type: 'Collapse', typeDescribe: '分组', dataKey: `f_${grp.refFieldId}`,
+                        children,
+                    });
+                }
+                finalConfigs = [...collapses, ...ungrouped.map(normalize)];
+                let so = 0;
+                for (const c of finalConfigs) {
+                    c.showOrder = so++;
+                    for (const ch of (c.children || []))
+                        ch.showOrder = so++;
+                }
+            }
+            else {
+                // EXCEL：分组字段前置 → 系统 → 未分组
+                const groupFieldIdSet = new Set(created.flatMap((g) => g.fieldIds));
+                finalConfigs = [
+                    ...rawCfgs.filter((c) => groupFieldIdSet.has(String(c.id))),
+                    ...rawCfgs.filter((c) => c.system),
+                    ...rawCfgs.filter((c) => !groupFieldIdSet.has(String(c.id)) && !c.system),
+                ].map(normalize);
+            }
             await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/initLayout${apidQ}`, {
                 formId, module: 'ebuilderform', apiModule: 'ebuilder/form', layoutId,
                 generateCollapse: true, styleTemplateId: layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008', styleTemplateType: 1,
                 configs: finalConfigs, addLayout: false, ecodeType: ['js', 'css'], initMode: '5',
-                groupFieldIds: [],
+                groupFieldIds,
                 customParam: { terminal: '', objId: formId },
                 formLayoutMultiple: { isSys: true, id: layoutMultiId, name: layoutName, terminalType: 'PC', layoutType },
                 designerParam: { onlyLayout: false },
             }, ebb);
             console.log(opts.json
-                ? JSON.stringify({ success: true, formId, groups: created.map((g) => ({ name: g.name, groupId: g.groupId, refFieldId: g.refFieldId, fieldCount: g.fieldIds.length, reused: existing.has(g.name) })) }, null, 2)
-                : `字段分组完成: ${created.length} 个分组（布局已重建，generateCollapse 自动渲染）`);
+                ? JSON.stringify({ success: true, formId, layoutType, groups: created.map((g) => ({ name: g.name, groupId: g.groupId, refFieldId: g.refFieldId, fieldCount: g.fieldIds.length, reused: existing.has(g.name) })) }, null, 2)
+                : `字段分组完成: ${created.length} 个分组（${layoutType} 布局已重建）`);
         }
         catch (e) {
             console.error(`字段分组失败: ${e.message}`);