5 changed files with 34 additions and 45 deletions
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "material-editor",
  "private": true,
-  "version": "1.0.34",
+  "version": "1.0.26",
  "type": "module",
  "scripts": {
    "dev": "vite",
--- a/src/components/MaterialAdjuster.vue
+++ b/src/components/MaterialAdjuster.vue
@ -1,13 +1,12 @@
 <template>
    <div vertical class="material-adjuster">
-        <!-- 新增模式下，隐藏材质名输入框 -->
-        <div v-if="ignoreTexture" class="adjust-section">
+        <div class="adjust-section">
            <h3>操作</h3>
            <fieldset v-if="debugMode" style="margin: 1em 0;">
                <legend>DEBUG</legend>
                <label>上传路径ID</label>
                <input v-model="materialInfo.dirId" type="text" placeholder="材质路径ID" />
-                <label>纹理(BASE64)</label>
+                <label>配置JSON</label>
                <input v-model="materialInfo.inputText" type="text" />
                <button class="btn-success" style="min-width: 110px;" @click="loadData">加载</button>
            </fieldset>
@ -60,8 +59,7 @@
            <label>高光</label>
            <CfFlex gap="1em" class="input-range">
                <input v-model="emissiveIntensity" type="range" min="0" max="1" step="0.01" />
-                <input v-model="emissiveIntensity" type="number" @change="ClampNumericValue" min="0" max="1"
-                    step="0.01" />
+                <input v-model="emissiveIntensity" type="number" @change="ClampNumericValue" min="0" max="1" step="0.01" />
            </CfFlex>
        </div>

@ -137,7 +135,7 @@ const { Material, CurrGeometry, Geometries } = storeToRefs(scene);

 const props = defineProps<{
    name?: string;
-    textures?: { name: string, src: string }[];
+    textureSrcList?: string[];
    /** 忽略纹理参数，提交时直接输出场景内的材质，用于某些在组件外对场景进行编辑的特殊情况（例如材质编辑模式） */
    ignoreTexture?: boolean;
 }>();
@ -147,7 +145,7 @@ const emits = defineEmits<{
 }>();

 const debugMode = ref(false);
-const Textures = computed(() => props.textures || []);
+const textureSrc = computed(() => props.textureSrcList || []);
 const debugTextureSrc = ref("");
 const textureAdjustment = ref<TextureAdjustment>({
    wrapS: MirroredRepeatWrapping,
@ -200,17 +198,17 @@ const uploading = ref(false);
 // });
 const materialInfo = reactive({
    dirId: DirectoryId.MaterialDir, // 正常来说是2
-    materialName: props.name || Textures.value[0]?.name || '材质',
+    materialName: props.name || '材质',
    inputText: '',
 });

-watch(Textures, async (val) => {
-    if (val.length == 0 || props.ignoreTexture) return;
-    await scene.ChangeTextureFromUrlAsync(val[0].src);
+watch(textureSrc, async (val) => {
+    if (val.length == 0) return;
+    await scene.ChangeTextureFromUrlAsync(val[0]);
 });

 watch(() => props.name, () => {
-    materialInfo.materialName = props.name || Textures.value[0]?.name || '材质';
+    materialInfo.materialName = props.name || '材质';
 });

 watch(textureAdjustment, async (val) => {
@ -247,7 +245,8 @@ async function UpdateMaterial() {

 async function loadData() {
    if (!materialInfo.inputText) return;
-    const cadFile = FromDeflateBase64(materialInfo.inputText);
+    const json = JSON.parse(materialInfo.inputText);
+    const cadFile = FromDeflateBase64(json.file);
    scene.ImportMaterialAsync(cadFile)
 }

@ -262,9 +261,7 @@ async function HandleUpload() {
        uploading.value = true;
        const result = [];
        if (props.ignoreTexture) {
-            // 注意更改材质内部名称
-            Material.value.Name = materialInfo.materialName;
-            // 将材质序列化
+            // 直接将材质序列化
            const mat = {
                name: materialInfo.materialName,
                logo: await scene.GenerateMaterialLogoAsync(),
@ -275,23 +272,20 @@ async function HandleUpload() {
        }
        else {
            // 遍历纹理链接列表，更改纹理后将材质序列化，然后还原场景
-            for (const texture of Textures.value) {
-                // 注意更改材质内部名称
-                Material.value.Name = texture.name;
-                // 更新纹理
-                await scene.ChangeTextureFromUrlAsync(texture.src);
+            let idx = 0;
+            for (const src of textureSrc.value) {
+                await scene.ChangeTextureFromUrlAsync(src);
                const mat = {
-                    name: texture.name,
+                    name: textureSrc.value.length > 1 ? materialInfo.materialName + ++idx : materialInfo.materialName,
                    logo: await scene.GenerateMaterialLogoAsync(),
                    // jsonString -> Deflate -> BinaryString -> Base64
                    file: ToDeflatedBase64(await scene.SerializeMaterialAsync())
                };
                result.push(mat);
            }
-            // 还原场景纹理
-            await scene.ChangeTextureFromUrlAsync(Textures.value[0].src);
        }

+        await scene.ChangeTextureFromUrlAsync(textureSrc.value[0]);
        emits('submit', result);
        return result;
    } finally {
--- a/src/components/MaterialView.vue
+++ b/src/components/MaterialView.vue
@ -1,7 +1,7 @@
 <template>
    <CfFlex class="material-view">
        <div ref="container" class="material-view-container" />
-        <MaterialAdjuster ref="adjuster" class="material-view-sider" :name="matName" :textures="textures" :ignore-texture="editMode"
+        <MaterialAdjuster ref="adjuster" class="material-view-sider" :name="matName" :textureSrcList="textureSrc" :ignore-texture="editMode"
            @cancel="config.cancelCallback" @submit="config.submitCallback" />
    </CfFlex>
 </template>
@ -19,7 +19,7 @@ const eventbus = useEvent();
 const container = useTemplateRef('container');
 const adjusterRef = useTemplateRef('adjuster');
 const config = GetConfig();
-const textures = ref<{name: string, src: string}[]>(Array.from(config.textures));
+const textureSrc = ref<string[]>(Array.from(config.textureSrc));
 const matName = ref<string>();
 const editMode = ref(false);

@ -45,7 +45,7 @@ function HandleUpload() {
 }

 function HandleChangeTexture() {
-    textures.value = Array.from(config.textures);
+    textureSrc.value = Array.from(config.textureSrc);
 }

 async function HandleUpdateConfig() {
@ -56,9 +56,9 @@ async function HandleUpdateConfig() {
        editMode.value = true;
    }
    else { editMode.value = false; }
-    if (config.textures && config.textures.length > 0) {
-        textures.value = Array.from(config.textures);
-        await scene.ChangeTextureFromUrlAsync(textures.value[0].src); // 这一行是保证首次Mount组件时纹理能够立刻刷新
+    if (config.textureSrc) {
+        textureSrc.value = Array.from(config.textureSrc);
+        await scene.ChangeTextureFromUrlAsync(textureSrc.value[0]); // 这一行是保证首次Mount组件时纹理能够立刻刷新
    }
 }

--- a/src/lib/libOutputConfig.ts
+++ b/src/lib/libOutputConfig.ts
@ -3,7 +3,7 @@ import type { MaterialRequest } from "../components/MaterialAdjuster.vue"

 let _libOutputConfig = {
    host:'https://tapi.cfcad.cn:7779',
-    textures: [],
+    textureSrc: [],
    file: undefined,
    submitCallback: undefined,
    cancelCallback: undefined,
@ -24,12 +24,7 @@ export type LibOutputConfig = {
     */
    host: string,
    /** 材质贴图链接列表，用与批量提交，场景会只会载入第一个链接作为纹理预览，但是导出提交时会为所有链接创建材质 */
-    textures: Array<{
-        /** 材质名 */
-        name: string;
-        /** 纹理链接 */
-        src: string;
-    }>,
+    textureSrc: Array<string>,
    /** 更新模型，对材质进行编辑时赋值 */
    updateModel?: {
        /** 材质名 */
--- a/src/stores/sceneStore.ts
+++ b/src/stores/sceneStore.ts
@ -7,7 +7,6 @@ import { ClampToEdgeWrapping, MirroredRepeatWrapping, RepeatWrapping, Texture }
 import { materialRenderer } from "../common/MaterialRenderer";
 import { MaterialIn, MaterialOut } from "../common/MaterialSerializer";
 import { GetConfig } from "../lib/libOutputConfig";
-import { AsyncDelay } from "../helpers/helper.async";

 const sceneSetup = () => {
    let _editor: MaterialEditor | undefined;
@ -99,6 +98,7 @@ const sceneSetup = () => {
    }

    async function ChangeTextureFromUrlAsync(url?: string) {
+        console.warn("Update texture from url:", url);
        // 关联贴图
        const db = Material.value.Db;
        // 材质未初始化
@ -106,15 +106,17 @@ const sceneSetup = () => {
            console.warn("Material has not been initialized");
            return;
        }
-
-        // 如果url为空，则保留原有材质中的纹理（修改模式），否则重新实例化纹理对象
        let record = Material.value.map?.Object as TextureTableRecord;
-        if (url) {
+        if (!record) {
+            // record = db.TextureTable.Symbols.values().next().value;
+            // if(!record){
            record = new TextureTableRecord();
            record.Name = db.TextureTable.AllocateName();
            db.TextureTable.Add(record);
            // 替换map
            Material.value.map = record.Id;
+            // Material.value.map = img ? record.Id : undefined;
+            // }
        }

        // 设置Store
@ -126,14 +128,12 @@ const sceneSetup = () => {
        }

        if (!texture.image) {
-            console.warn('Load Image: ', GetConfig().host + '/' + record.imageUrl);
            const img = await LoadImageFromUrl(GetConfig().host + '/' + record.imageUrl);
            texture.image = img;
        }
        
+        texture.needsUpdate = true;
        UpdateTexture();
-        await record.Update();
-        await AsyncDelay(10);
        await UpdateMaterialAsync();
    }