完成资源分组加载功能

src/config.js

@@ -6,7 +6,7 @@ export let API_HOST;
 if (process.env.NODE_ENV === 'development') {
 	//API_HOST = '//10.10.95.74:7777';
 	//API_HOST = '//192.168.1.16:7777';
-	API_HOST = '//10.10.94.107:3000';
+	API_HOST = '//0.0.0.0:3000';
 	//API_HOST = '//192.168.0.105:7777';
 	//API_HOST = '//localhost:3002';
 	//API_HOST = window.__data.apiHost;

src/locales/zh-CN.json

@@ -104,6 +104,7 @@
 	"Loading view": "加载视图",
 	"Page title": "页面标题",
 	"Container ID": "容器ID",
+	"Lazy Load Delay": "懒加载延时",
 	"Design width": "设计宽度",
 	"Design height": "设计高度",
 	"Frame Rate": "帧率",

src/store/modules/project.js

@@ -34,6 +34,7 @@ const defaultOptions = {
 	pageTitle: 'no title',
 	entrySceneView: '',
 	loadingView: '',
+	lazyLoadWait: 1000,
 	containerId: 'game-container',
 	designWidth: 750,
 	designHeight: 1334,
@@ -147,7 +148,7 @@ export const projectStore = {
 				}
 				if (view.explicitDepAssets) {
 					view.explicitDepAssets.splice(0);
-				}else{
+				} else {
 					Vue.set(view, 'explicitDepAssets', []);
 				}
 				explicitDepAssets = view.explicitDepAssets;
@@ -162,7 +163,7 @@ export const projectStore = {
 						let uuid = prop.replace(assetScheme, '');
 						let asset = assets.find(asset => asset.uuid === uuid);
 						if (asset) {
-							if (!explicitDepAssets.includes(asset.uuid)){
+							if (!explicitDepAssets.includes(asset.uuid)) {
 								explicitDepAssets.push(asset.uuid);
 							}
 						}
@@ -402,7 +403,7 @@ export const projectStore = {
 			let _node1 = node;
 			console.log(_node1)
 			copyNodeCatch = clonePureObj(_node1)
-			console.log("copyNodeCatch",copyNodeCatch)
+			console.log("copyNodeCatch", copyNodeCatch)
 			if (copyState == 1) {
 				//复制行为
 				copyNodeCatch.events
@@ -411,12 +412,13 @@ export const projectStore = {
 				console.log(this)
 				deleteChildEvent(copyNodeCatch)
 			}
+
 			//copy(JSON.stringify(copyNodeCatch))
-			function deleteChildEvent(copyNodeCatch){
+			function deleteChildEvent(copyNodeCatch) {
 				console.log(123)
 				delete copyNodeCatch.events;
-				if(copyNodeCatch.children){
-					 for(let item of copyNodeCatch.children){
+				if (copyNodeCatch.children) {
+					for (let item of copyNodeCatch.children) {
 						deleteChildEvent(item)
 					}
 				}
@@ -529,9 +531,10 @@ export const projectStore = {
 			this.commit('makeProjectDirty');
 		},
 
-		modifyViewDepAssets(state, {view, explicitDepAssets, implicitDepAssets}){
+		modifyViewDepAssets(state, {view, explicitDepAssets, implicitDepAssets, depCustoms}) {
 			view.explicitDepAssets = explicitDepAssets;
 			view.implicitDepAssets = implicitDepAssets;
+			view.depCustoms = depCustoms;
 
 			this.commit('makeProjectDirty');
 		}
@@ -614,11 +617,14 @@ export const projectStore = {
 		assets(state) {
 			return state.data.assets;
 		},
-		assetDepFlag: state=> uuid => {
-			return state.data.views.filter(view=>
+		assetDepFlag: state => uuid => {
+			return state.data.views.filter(view =>
 				view.explicitDepAssets.includes(uuid) || view.implicitDepAssets.includes(uuid)
 			).length > 0 ? 0 : -1;
 		},
+		customs(state) {
+			return state.data.customs;
+		},
 		getProcess: state => behavior => {
 			return arrayFind(state.data.processes, process => process.id === behavior.meta);
 		},

src/themes/light/inspector.scss

@@ -179,26 +179,35 @@
 		flex-direction: column;
 		height: 50vh;
 
-		.explicit-tags{
+		.assets-dep {
+			flex: 1;
+			height: 0;
 			display: flex;
+			flex-direction: column;
+			margin-bottom: 5px;
 
-			div+div{
-				margin-left: 5px;
+			.explicit-tags {
+				display: flex;
+
+				div + div {
+					margin-left: 10px;
 				}
 
-			div{
+				div {
 					display: flex;
 					align-items: center;
 
-				div{
+					div {
 						width: 10px;
 						height: 10px;
+						margin-right: 2px;
 					}
 
-				.explicit{
+					.explicit {
 						background-color: $--color-danger;
 					}
-				.implicit{
+
+					.implicit {
 						background-color: $--color-success;
 					}
 				}
@@ -210,4 +219,14 @@
 				border: 1px solid $--border-color-light;
 			}
 		}
+
+		.custom-dep {
+			display: flex;
+			align-items: center;
+
+			.select{
+				flex: 1;
+			}
+		}
+	}
 }

src/utils/assets-pack.js

@@ -80,7 +80,7 @@ async function packAssets(key, assets) {
 		return new Promise(async (resolve, reject) => {
 			try {
 				if (asset.file) {
-					uploadSheet(asset).catch(e => {
+					await uploadSheet(asset).catch(e => {
 						failedList.push(asset);
 					});
 				}

src/views/Editor/Inspector/PropsTab/AssetDependenceDialog.vue

@@ -10,6 +10,7 @@
 		custom-class="asset-dependence-dialog flex-dialog"
 	>
 		<div class="wrapper">
+			<div class="assets-dep">
 				<div class="explicit-tags">
 					<div>
 						<div class="explicit"></div>
@@ -32,13 +33,22 @@
 					/>
 				</el-scrollbar>
 			</div>
+			<div class="custom-dep">
+				<span>自定义模块依赖</span>
+				<el-select class="select" multiple v-model="depCustoms" size="mini">
+					<el-option v-for="custom in customs"
+						:key="custom.id"
+						:value="custom.id"
+						:label="custom.name"
+					>
+					</el-option>
+				</el-select>
+			</div>
+		</div>
 		<div slot="footer" class="dialog-footer">
 			<div></div>
 			<div>
-				<el-popconfirm @onConfirm="clickClose" placement="top"
-				               :title="$t('Are you sure to close?')">
-					<el-button slot="reference" size="mini">{{ $t("Close") }}</el-button>
-				</el-popconfirm>
+				<el-button slot="reference" size="mini" @click="clickClose">{{ $t("Close") }}</el-button>
 				<el-button class="save-button" type="primary" size="mini" @click="clickSave">{{ $t("Save") }}
 				</el-button>
 			</div>
@@ -47,7 +57,7 @@
 </template>
 
 <script>
-	import {mapMutations} from 'vuex';
+	import {mapMutations, mapGetters} from 'vuex';
 	import MonacoEditor from "vue-monaco";
 	import {clonePureObj, monacoEditorOptions} from "../../../../utils";
 	import AssetList from "../../Assets/AssetList";
@@ -67,15 +77,19 @@
 				view: null,
 				explicitDepAssets: [],
 				implicitDepAssets: [],
+				depCustoms: [],
 			}
 		},
-		computed: {},
+		computed: {
+			...mapGetters(['customs']),
+		},
 		methods: {
 			async edit(view) {
 				this.view = view;
 
 				this.explicitDepAssets = view.explicitDepAssets.concat();
 				this.implicitDepAssets = view.implicitDepAssets.concat();
+				this.depCustoms = view.depCustoms ? view.depCustoms.concat() : [];
 
 				this.assetsSource = clonePureObj(this.$store.getters.assets);
 
@@ -86,6 +100,7 @@
 					view: this.view,
 					explicitDepAssets: this.explicitDepAssets,
 					implicitDepAssets: this.implicitDepAssets,
+					depCustoms: this.depCustoms
 				});
 				this.visible = false;
 			},
@@ -103,7 +118,7 @@
 				let index = implicitDepAssets.indexOf(uuid);
 				if (index >= 0) {
 					implicitDepAssets.splice(index, 1);
-				}else{
+				} else {
 					implicitDepAssets.push(uuid);
 				}
 			},

src/views/Editor/dialogs/editors/ProjectEditor.vue

@@ -27,6 +27,9 @@
 					></el-option>
 				</el-select>
 			</el-form-item>
+			<el-form-item prop="lazyLoadWait" :label="$t('Lazy Load Delay')">
+				<el-input-number v-model="editData.lazyLoadWait" placeholder="1000" controls-position="right"/>
+			</el-form-item>
 			<el-form-item prop="containerId" :label="$t('Container ID')">
 				<el-input v-model="editData.containerId"/>
 			</el-form-item>