!2801 优化:补充酷家乐备注,可添加到10行

src/Add-on/KJL/Import/KJLImport.ts

@@ -334,9 +334,20 @@ async function ParseModel(model: KJL_ParamModel,
         let kmfx = ParseKMFX(model.parameters) ?? ParseKMFX(model.ignoreParameters) ?? ParseKMFX(model.constParameters);
         if (kmfx !== undefined)
             br.OpenDir = kmfx;
-        let bcbz = ParseBCBZ(model.parameters) ?? ParseBCBZ(model.ignoreParameters) ?? ParseBCBZ(model.constParameters);
-        if (bcbz !== undefined)
-            br.BoardProcessOption.remarks.push(["KJLBCBZ", bcbz]);
+        let remarks = [];
+        ParseBCBZ(model.parameters, remarks) ?? ParseBCBZ(model.ignoreParameters, remarks) ?? ParseBCBZ(model.constParameters, remarks);
+        if (remarks.length > 0)
+        {
+            // 排序
+            remarks.sort((a, b) =>
+            {
+                let numA = parseInt(a[0].substring(7)) || 0;
+                let numB = parseInt(b[0].substring(7)) || 0;
+
+                return numA - numB;
+            });
+            br.BoardProcessOption.remarks.push(...remarks);
+        }
 
         // //@ts-ignore
         // br.testData = {
@@ -565,12 +576,23 @@ async function ParseModel(model: KJL_ParamModel,
                 if (obj instanceof Board)
                 {
                     let kmfx = ParseKMFX(model.parameters) ?? ParseKMFX(model.ignoreParameters) ?? ParseKMFX(model.constParameters);
-                    let bcbz = ParseBCBZ(model.parameters) ?? ParseBCBZ(model.ignoreParameters) ?? ParseBCBZ(model.constParameters);
+                    let remarks = [];
+                    ParseBCBZ(model.parameters, remarks) ?? ParseBCBZ(model.ignoreParameters, remarks) ?? ParseBCBZ(model.constParameters, remarks);
+                    if (remarks.length > 0)
+                    {
+                        // 排序
+                        remarks.sort((a, b) =>
+                        {
+                            let numA = parseInt(a[0].substring(7)) || 0;
+                            let numB = parseInt(b[0].substring(7)) || 0;
+
+                            return numA - numB;
+                        });
+                        obj.BoardProcessOption.remarks.push(...remarks);
+                    }
 
                     if (kmfx !== undefined)
                         obj.OpenDir = kmfx;
-                    if (bcbz !== undefined)
-                        obj.BoardProcessOption.remarks.push(["KJLBCBZ", bcbz]);
 
                     if (config.option.kjlUseName !== KJLUseName.modelName && model.modelBrandGoodName !== gName)
                         obj.Name = model.modelBrandGoodName;

src/Add-on/KJL/Import/KJLParse.ts

@@ -87,14 +87,20 @@ export function ParseKMFX(params: KJL_Parameter[]): BoardOpenDir
     }
 }
 
-export function ParseBCBZ(params: KJL_Parameter[]): string
+export function ParseBCBZ(params: KJL_Parameter[], remarks: [string, string][]): string
 {
     if (!params) return;
 
     for (let p of params)
     {
         if (p.name === "BCBZ")
-            return p.value;
+            remarks.push(["KJLBCBZ", p.value]);
+        else if (p.name.startsWith("BCBZ"))
+        {
+            let num = p.name.substring(4);
+            if (parseInt(num) <= 9) //限制到9
+                remarks.push(["KJLBCBZ" + num, p.value]);
+        }
     }
 }
 

src/Add-on/KJL/kjl_doc.md

@@ -45,7 +45,7 @@ modelTypeId=3时
 板材名 textureName
 材料 baseTexture
 大孔面 SBFX 0-正，1-反
-板备注 BCBZ
+板备注 BCBZ,BCBZ(1-9),目前只支持到10个备注
 
 开门方向 openDirection
 0 左开门

src/UI/Components/Board/BoardCommon.tsx

@@ -389,8 +389,8 @@ export class Notes extends React.Component<{ remarks: [string, string][]; }>
                 {
                     this.props.remarks.map((d, i) =>
                         <div className=" note-item" key={i}>
-                            <input type="text" className="bp3-input" tabIndex={1} value={d[0]} onChange={e => d[0] = e.target.value} />
-                            <input type="text" className="bp3-input" tabIndex={1} value={d[1]} onChange={e => d[1] = e.target.value} />
+                            <input type="text" className="bp3-input" tabIndex={1} title={d[0]} value={d[0]} onChange={e => d[0] = e.target.value} />
+                            <input type="text" className="bp3-input" tabIndex={1} title={d[1]} value={d[1]} onChange={e => d[1] = e.target.value} />
                         </div>)
                 }
             </div>