bill 1 rok temu
rodzic
commit
46c6b0617a
3 zmienionych plików z 17 dodań i 15 usunięć
  1. 6 6
      src/api/setting-resource.ts
  2. 1 0
      src/sdk/association.ts
  3. 10 9
      src/views/setting/index.vue

+ 6 - 6
src/api/setting-resource.ts

@@ -39,12 +39,12 @@ export const settingResources = ref<SettingResources>([]);
 export const fetchSettingResources = async () => {
   settingResources.value = [
     { sys: true, name: "无", backType: SettingResourceType.icon, resource: "icon-without" },
-    { sys: true, name: '蓝天白云', backType: SettingResourceType.envImage, resource: "/env-img/pic_ltby@2x.png", },
-    { sys: true, name: '乌云密布', backType: SettingResourceType.envImage, resource: "/env-img/pic_wymb@2x.png",},
-    { sys: true, name: '夜空', backType: SettingResourceType.envImage, resource: "/env-img/pic_yk@2x.png", },
-    { sys: true, name: '草地', backType: SettingResourceType.envImage, resource: "/env-img/pic_cd@2x.png", },
-    { sys: true, name: '道路', backType: SettingResourceType.envImage, resource: "/env-img/pic_dl@2x.png", },
-    { sys: true, name: '傍晚', backType: SettingResourceType.envImage, resource: "/env-img/pic_bw@2x.png", },
+    { sys: true, name: '蓝天白云', backType: SettingResourceType.envImage, resource: "./env-img/pic_ltby@2x.png", },
+    { sys: true, name: '乌云密布', backType: SettingResourceType.envImage, resource: "./env-img/pic_wymb@2x.png",},
+    { sys: true, name: '夜空', backType: SettingResourceType.envImage, resource: "./env-img/pic_yk@2x.png", },
+    { sys: true, name: '草地', backType: SettingResourceType.envImage, resource: "./env-img/pic_cd@2x.png", },
+    { sys: true, name: '道路', backType: SettingResourceType.envImage, resource: "./env-img/pic_dl@2x.png", },
+    { sys: true, name: '傍晚', backType: SettingResourceType.envImage, resource: "./env-img/pic_bw@2x.png", },
     { sys: true, name: '灰色', backType: SettingResourceType.color, resource: '#333333', },
     { sys: true, name: '黑色', backType: SettingResourceType.color, resource: '#000000', },
     { sys: true, name: '白色', backType: SettingResourceType.color, resource: '#ffffff', },

+ 1 - 0
src/sdk/association.ts

@@ -164,6 +164,7 @@ const setModels = (models: FuseModels, oldModels: FuseModels) => {
     sceneModel.bus.on('loadProgress', progress => item.progress = progress)
   }
   for (const item of deleted) {
+    console.error('销毁', item)
     getSceneModel(item)?.destroy()
   }
 }

+ 10 - 9
src/views/setting/index.vue

@@ -132,15 +132,7 @@
         maxlength="15"
       />
       <div class="edit-hot">
-        <a
-          @click="
-            async () => {
-              await addSettingResource(addTemp!);
-              addTemp = undefined;
-              await fetchSettingResources();
-            }
-          "
-        >
+        <a @click="addBack">
           <ui-icon type="nav-edit" />
           确定
         </a>
@@ -190,6 +182,15 @@ import { Slider } from "ant-design-vue";
 
 fetchSettingResources();
 
+const addBack = async () => {
+  if (!addTemp.value!.name.trim()) {
+    Dialog.alert("请输入名称");
+    return;
+  }
+  await addSettingResource(addTemp.value!);
+  addTemp.value = undefined;
+  await fetchSettingResources();
+};
 const enterSetPic = () => {
   enterEdit(
     togetherCallback([