merge

.history/src/config_20191129114418.js

+/**
+ * Created by rockyl on 2019-09-19.
+ */
+
+export let API_HOST;
+if (process.env.NODE_ENV === 'development') {
+	//API_HOST = 'http://10.10.95.74:7777';
+	//API_HOST = 'http://10.10.94.134:7777';
+	//API_HOST = 'http://localhost:3002';
+	API_HOST = window.__data.apiHost;
+<<<<<<< HEAD
+=======
+	//API_HOST = '';
+>>>>>>> 4be75099e23b6946a0ba4a754861b69a32bad830
+} else {
+	API_HOST = window.__data.apiHost;
+}
+
+if (API_HOST[API_HOST.length - 1] === '/') {
+	API_HOST = API_HOST.substr(0, API_HOST.length - 1);
+}
+
+export const SSO_VERIFY_PAGE_URL = '/sso/logout';
+
+export const DOCK_POINT_OFFSET = 4;
+
+//文件类型图标  t表示展示缩略图
+export const fileTypeIcon = {
+	'': 'file-empty',
+	'.txt': 'file-text',
+	'.json': 'file-text',
+	'.zip': 'file-zip',
+	'.fnt': 'file-font',
+
+	'.jpg': 't',
+	'.jpeg': 't',
+	'.png': 't',
+	'.gif': 't',
+	'.svg': 't',
+};

.history/src/config_20191129114434.js

+/**
+ * Created by rockyl on 2019-09-19.
+ */
+
+export let API_HOST;
+if (process.env.NODE_ENV === 'development') {
+	//API_HOST = 'http://10.10.95.74:7777';
+	//API_HOST = 'http://10.10.94.134:7777';
+	//API_HOST = 'http://localhost:3002';
+	API_HOST = window.__data.apiHost;
+	//API_HOST = '';
+} else {
+	API_HOST = window.__data.apiHost;
+}
+
+if (API_HOST[API_HOST.length - 1] === '/') {
+	API_HOST = API_HOST.substr(0, API_HOST.length - 1);
+}
+
+export const SSO_VERIFY_PAGE_URL = '/sso/logout';
+
+export const DOCK_POINT_OFFSET = 4;
+
+//文件类型图标  t表示展示缩略图
+export const fileTypeIcon = {
+	'': 'file-empty',
+	'.txt': 'file-text',
+	'.json': 'file-text',
+	'.zip': 'file-zip',
+	'.fnt': 'file-font',
+
+	'.jpg': 't',
+	'.jpeg': 't',
+	'.png': 't',
+	'.gif': 't',
+	'.svg': 't',
+};

jsx/自动拆分.jsx

+/**
+ * Created by rockyl on 2019-11-25.
+ */
+
+var curDocument = app.activeDocument;
+
+//alert(ShowObjProperty2(curDocument.activeLayer).attributes);
+//alert(ShowObjProperty2(oldDocument.activeLayer).methods);
+
+for (var i = 0; i < curDocument.layers.length; i++) {
+	var layer = curDocument.layers[i];
+	if (!layer.name.match(/__e$/)) {
+		duplicateToNewDocument(layer);
+	}
+}
+
+function createDocument(width, height, docName) {
+
+//定义一个变量[resolution]，表示新文档的分辨率。
+	var resolution = 72;
+
+//定义一个变量[mode]，表示新文档的颜色模式。
+	var mode = NewDocumentMode.RGB;
+
+//定义一个变量[initialFill]，表示新文档的默认背景填充颜色。
+	var initialFill = DocumentFill.TRANSPARENT;
+
+//定义一个变量[pixelAspectRatio]，用来设置新文档的像素比率。
+	var pixelAspectRatio = 1;
+
+//使用[Documents.add]命令创建一个新文档，将设置好的参数放在[add]方法里面。
+	var document = app.documents.add(width, height, resolution, docName, mode, initialFill, pixelAspectRatio);
+	return document;
+}
+
+function duplicateToNewDocument(layer) {
+	var document = createDocument(curDocument.width, curDocument.height, layer.name);
+	app.activeDocument = curDocument;
+	layer.duplicate(document, ElementPlacement.PLACEATBEGINNING);
+}
+
+function ShowObjProperty2(obj) {
+	// 用来保存所有的属性名称和值
+	var attributes = '';
+	var methods = '';
+	// 开始遍历
+	for (var p in obj) {
+		// 方法
+		if (typeof (obj[p]) === "function") {
+			methods += '属性：' + p + '\r\n'
+			// obj[p]();
+		} else {
+			// p 为属性名称，obj[p]为对应属性的值
+			attributes += '方法：' + p + " = " + obj[p] + "\r\n";
+		}
+	}
+	// 最后显示所有的属性
+	return {
+		attributes: attributes,
+		methods: methods
+	}
+}

jsx/自动整理.jsx

+/**
+ * Created by rockyl on 2019-11-25.
+ */
+
+var mergeFlagReg = /__m$/;
+var excludeFlagReg = /__e$/;
+var extName = '.psd';
+
+var oldDocument = app.activeDocument;
+
+var mergeLayers = [];
+
+var document = oldDocument.duplicate(oldDocument.name.replace(extName, '') + '-合并' + extName, 0);
+
+function traverse(layer, callback) {
+	if (layer.layers) {
+		for (var i = 0, li = layer.layers.length; i < li; i++) {
+			var childLayer = layer.layers[i];
+			var action = callback(childLayer);
+			switch (action) {
+				case 0:
+					traverse(childLayer, callback);
+					break;
+				case 2:
+					i--;
+					li--;
+					break;
+			}
+		}
+	}
+}
+
+function deleteDocumentAncestorsMetadata() {
+	whatApp = String(app.name);//String version of the app name
+	if(whatApp.search("Photoshop") > 0) { //Check for photoshop specifically, or this will cause errors
+//Function Scrubs Document Ancestors from Files
+		if(!documents.length) {
+			alert("There are no open documents. Please open a file to run this script.")
+			return;
+		}
+		if (ExternalObject.AdobeXMPScript == undefined) ExternalObject.AdobeXMPScript = new ExternalObject("lib:AdobeXMPScript");
+		var xmp = new XMPMeta( activeDocument.xmpMetadata.rawData);
+// Begone foul Document Ancestors!
+		xmp.deleteProperty(XMPConst.NS_PHOTOSHOP, "DocumentAncestors");
+		app.activeDocument.xmpMetadata.rawData = xmp.serialize();
+	}
+}
+
+function execute(document) {
+	traverse(document, function (layer) {
+		if (layer.name.match(mergeFlagReg)) {
+			document.activeLayer = layer;
+
+			var newName = layer.name.replace(mergeFlagReg, '');
+			layer.name = newName;
+
+			mergeLayers.push(newName);
+
+			layer.merge();
+			return 1;
+		} else if (layer.name.match(excludeFlagReg)) {
+			layer.remove();
+			return 2;
+		}
+		return 0;
+	});
+
+	deleteDocumentAncestorsMetadata();
+
+	document.crop([0, 0, oldDocument.width, oldDocument.height], 0);
+
+	/*if (mergeLayers.length > 0) {
+		alert('合并的图层有: ' + mergeLayers.join(','));
+	} else {
+		alert('没有图层被合并');
+	}*/
+	alert('整理完成');
+}
+
+execute(document);

src/api/common.js

@@ -36,12 +36,27 @@ export async function fetchApi(uri, {params, method = 'get', contentType = 'json
 	};
 	if (params) {
 		if (method.toLowerCase() === 'post') {
-			if (contentType === 'form') {
+			switch(contentType){
+				case 'form-data':
+					let formData = new FormData();
+					for (let key in params) {
+						let value = params[key];
+						if(value instanceof File){
+							formData.append(key, value, value.name);
+						}else{
+							formData.append(key, value);
+						}
+					}
+					options.body = formData;
+					break;
+				case 'form':
 					options.headers['Content-Type'] = 'application/x-www-form-urlencoded';
 					options.body = stringify(params);
-			} else if (contentType === 'json') {
+					break;
+				case 'json':
 					options.headers['Content-Type'] = 'application/json';
 					options.body = JSON.stringify(params);
+					break;
 			}
 		} else {
 			url += (url.indexOf('?') < 0 ? '?' : '') + (url.endsWith('&') ? '' : '&') + stringify(params);
@@ -49,6 +64,9 @@ export async function fetchApi(uri, {params, method = 'get', contentType = 'json
 	}
 
 	const response = await fetch(url, options);
+	if (response.status === 401) {
+		location.href = '/admin/permission';
+	}
 	const jsonObj = await response.json();
 	//console.log(jsonObj);
 

src/api/project.js

@@ -59,3 +59,29 @@ export async function pack(id) {
 		errMessage: 'Failed to pack project',
 	})
 }
+
+export async function importView(file) {
+	const response = await fetchApi('/api/parsePSD', {
+		params: {
+			file,
+		},
+		method: 'post',
+		contentType: 'form-data',
+		errMessage: 'Failed to import view',
+	});
+	response.__originFile = file;
+	return response;
+}
+
+export async function uploadFile(file) {
+	const response = await fetchApi('/api/uploadFile', {
+		params: {
+			file,
+		},
+		method: 'post',
+		contentType: 'form-data',
+		errMessage: 'Failed to upload file',
+	});
+	response.__originFile = file;
+	return response;
+}

src/config.js

@@ -5,9 +5,10 @@
 export let API_HOST;
 if (process.env.NODE_ENV === 'development') {
 	//API_HOST = 'http://10.10.95.74:7777';
-	// API_HOST = 'http://10.10.94.134:7777';
+	//API_HOST = 'http://10.10.94.134:7777';
 	//API_HOST = 'http://localhost:3002';
 	API_HOST = window.__data.apiHost;
+	//API_HOST = '';
 } else {
 	API_HOST = window.__data.apiHost;
 }
@@ -16,9 +17,6 @@ if (API_HOST[API_HOST.length - 1] === '/') {
 	API_HOST = API_HOST.substr(0, API_HOST.length - 1);
 }
 
-export const UPLOAD_FILE_URL = API_HOST + '/api/uploadFile';
-export const PARSE_BUNDLE_URL = API_HOST + '/api/parsePSD';
-
 export const SSO_VERIFY_PAGE_URL = '/sso/logout';
 
 export const DOCK_POINT_OFFSET = 4;

src/locales/en.json

@@ -16,6 +16,7 @@
 	"Import": "Import",
 	"Export": "Export",
 	"Upload": "Upload",
+	"Uploading": "Uploading",
 	"Edit": "Edit",
 	"EditEnv": "EditEnv",
 	"EditCustomModule": "EditCustomModule",
@@ -118,7 +119,13 @@
 	"Custom node desc": "Custom node",
 	"Divider node desc": "Divider node, exit will be executed in sequence",
 	"Save this behavior before": "Save this behavior before?",
-	"Upload view failed": "Upload view failed",
+	"Failed to import view": "Failed to import view",
+	"Failed to upload file": "Failed to upload file",
+	"Single view": "Single view",
+	"Multi views": "Multi views",
+	"Import single": "Import single",
+	"Import multi": "Import multi",
+	"Import view success": "Import view success",
 	"menu": {
 		"save": "Save",
 		"details": "Details",

src/locales/zh-CN.json

@@ -16,6 +16,7 @@
 	"Import": "导入",
 	"Export": "导出",
 	"Upload": "上传",
+	"Uploading": "上传中",
 	"Edit": "编辑",
 	"EditEnv": "编辑环境",
 	"EditCustomModule": "编辑自定义模块",
@@ -118,7 +119,13 @@
 	"Custom node desc": "自定义节点",
 	"Divider node desc": "分流节点，出口会按顺序一次执行",
 	"Save this behavior before": "是否先保存这个行为?",
-	"Upload view failed": "上传视图失败",
+	"Failed to import view": "导入视图失败",
+	"Failed to upload file": "上传文件失败",
+	"Single view": "单视图",
+	"Multi views": "多视图",
+	"Import single": "导入单",
+	"Import multi": "导入多",
+	"Import view success": "视图导入成功",
 	"menu": {
 		"save": "保存",
 		"details": "详情",

src/store/modules/env.js

@@ -11,7 +11,7 @@ export const envStore = {
 	state: {
 		initialized: false,
 		name: 'Zeroing Editor',
-		version: '1.0.0',
+		version: '1.0.1',
 		templates: {
 			builtin: ['blank'],
 			custom: [],

src/store/modules/project.js

@@ -9,6 +9,8 @@ import generateUUID from "uuid/v4";
 import {getCmpProps, flattenViews, getCmpByUUID} from '../../utils/common';
 import {clonePureObj, saveAs} from "../../utils";
 import {template} from "../../template";
+import {importView, uploadFile} from "../../api/project";
+import events from "@/global-events";
 
 const defaultOptions = {
 	pageTitle: 'no title',
@@ -300,7 +302,7 @@ export const projectStore = {
 				}
 			}
 		},
-		deleteAllAssets(state){
+		deleteAllAssets(state) {
 			const {assets} = state.data;
 			assets.splice(0);
 		},
@@ -546,7 +548,21 @@ export const projectStore = {
 				scripts: _scripts
 			})
 		},
-
+		async importView({commit}, {file, action}) {
+			const {view, assets} = await importView(file);
+			switch (action) {
+				case 0: //单视图
+					view.name = file.name.substring(0, file.name.lastIndexOf('.'));
+					commit('importView', view);
+					break;
+				case 1: //多视图
+					for (let subView of view.children) {
+						commit('importView', subView);
+					}
+					break;
+			}
+			commit('importAssets', assets);
+		},
 		exportView({state}, view) {
 			let zip = new JSZip();
 			zip.file('view.json', JSON.stringify(view));
@@ -554,10 +570,37 @@ export const projectStore = {
 				saveAs(content, `view-${view.name}.zrv`);
 			});
 		},
-
+		async uploadFiles({commit}, files) {
+			const failedList = [];
+			let ps = [];
+			for (let file of files) {
+				events.$emit('upload-indicator', true);
+				ps.push(
+					uploadFile(file).catch(e => {
+					}).finally(() => {
+						events.$emit('upload-indicator', false);
+					})
+				);
+			}
+			const result = await Promise.all(ps);
+			for (let item of result) {
+				const {url, __originFile} = item;
+				commit('addAsset', {url, file: __originFile});
+			}
+			/*for (let file of files) {
+				try {
+					const {url} = await uploadFile(file);
+					commit('addAsset', {url, file});
+				}catch (e) {
+					failedList.push(file);
+				}
+				events.$emit('upload-indicator', false);
+			}*/
+			return failedList;
+		},
 		async packProject({state}) {
 			const result = await projectApi.pack(state.id);
-			console.log(result)
+			console.log(result);
 			return result;
 		}
 	},

src/themes/light/editor.scss

@@ -25,6 +25,10 @@
 			}
 		}
 
+		.file-upload-indicator{
+			color: $--color-text-secondary;
+		}
+
 		.right-part {
 			color: $--color-text-regular;
 			line-height: 15px;

src/themes/light/playground.scss

@@ -13,6 +13,10 @@
   zoom: 0.5;
   background: url(data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAiUlEQVQ4jZ1TSxLFIAhLOp7C+19NjyFvlQ7lUUvLRgXzgVGOMQyb6L3/5cwMJAEAxw6sy3FP8tw/EkhJqp7klQMBtKpWcpC1oVp7IoiqviXg4xBFRPL7EM/6WsviYDxwzrkVaBHsz5U4MlWfKxHEySpXIdk6qLRzcXBHVnKQfZRKCy1Ty979XfwApOBe0rB0KiIAAAAASUVORK5CYII=);
   background-repeat: repeat;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
 }
 // .zero-playground-draw-panel{
 //   min-height: 1200px;

src/utils/index.js

@@ -108,3 +108,18 @@ export function readTextFile(file) {
 		}, false);
 	})
 }
+
+export function selectFile(callback, {accept, multiple} = {}) {
+	let input = document.createElement('input');
+	input.type = 'file';
+	input.onchange = function (e) {
+		callback(input.files);
+	};
+	if (accept) {
+		input.accept = accept;
+	}
+	if (multiple) {
+		input.multiple = true;
+	}
+	input.click();
+}

src/views/Editor/Assets.vue

@@ -23,17 +23,9 @@
 				<el-scrollbar class="assets-scrollbar" wrap-class="wrap-x-hidden"
 				              view-class="scrollbar-view">
 					<div class="file-list">
-						<el-upload
-							class="file-uploader"
-							:action="uploadFileUrl"
-							name="file"
-							multiple
-							:show-file-list="false"
-							:on-success="uploadFileSuccess"
-							:on-error="uploadFileError"
-						>
+						<div class="file-uploader" @click="toUploadFile">
 							<i class="el-icon-plus file-uploader-icon"></i>
-						</el-upload>
+						</div>
 						<file-item v-for="(asset, index) in assets" :data="asset" :key="index" @show-file-details="showFileDetails"
 						           @click="onItemClick(asset)"/>
 					</div>
@@ -45,12 +37,12 @@
 </template>
 
 <script>
-	import {mapState, mapMutations} from 'vuex'
+	import {mapState, mapMutations, mapActions} from 'vuex'
 	import Pane from "../../components/Pane";
 	import FileItem from "./Assets/FileItem";
 	import AssetsShow from "./Assets/AssetsShow";
-	import {UPLOAD_FILE_URL} from "../../config";
 	import SplitPanes from 'splitpanes'
+	import {selectFile} from "../../utils";
 
 	export default {
 		name: "Assets",
@@ -59,12 +51,12 @@
 			return {
 				showFields: ['url', 'uuid'],
 				currentItem: null,
+				uploadHeaders: {
+					authorization: 'Bearer ' + window['zeroing_token'],
+				},
 			}
 		},
 		computed: {
-			uploadFileUrl() {
-				return UPLOAD_FILE_URL;
-			},
 			...mapState({
 				assets: state => state.project.data.assets
 			}),
@@ -73,27 +65,18 @@
 			this.currentItem = null;
 		},
 		methods: {
+			toUploadFile() {
+				selectFile((files) => {
+					this.uploadFiles(files);
+				}, {multiple: true})
+			},
 			showFileDetails(file) {
 				this.$refs.assetsShow.show(file);
 			},
 			onItemClick(asset) {
 				this.currentItem = asset;
 			},
-			uploadFileSuccess(response, file) {
-				if (response.success) {
-					//console.log('upload success', response, file);
-					this.addAsset({
-						url: response.url,
-						file,
-					})
-				} else {
-					this.uploadFileError();
-				}
-			},
-			uploadFileError() {
-				console.log('upload error')
-			},
-			deleteAll(){
+			deleteAll() {
 				this.$confirm(this.$t('Are you sure to delete all assets'), this.$t('Alert'), {
 					confirmButtonText: this.$t('Confirm'),
 					cancelButtonText: this.$t('Cancel'),
@@ -104,9 +87,11 @@
 				});
 			},
 			...mapMutations([
-				'addAsset',
 				'deleteAllAssets',
 			]),
+			...mapActions([
+				'uploadFiles',
+			]),
 		}
 	}
 </script>

src/views/Editor/ToolBar.vue

 <template>
 	<div class="tool-bar">
 		<sample-menu :data="menu" @click-menu="clickMenu"/>
+		<upload-indicator/>
+		<div style="flex: 1"></div>
 		<div class="right-part">
 			<span>
 				[{{project.name}}]
@@ -13,10 +15,11 @@
 <script>
 	import {mapState, mapActions, mapMutations} from 'vuex'
 	import SampleMenu from "../../components/SampleMenu";
+	import UploadIndicator from "./ToolBar/UploadIndicator";
 
 	export default {
 		name: "ToolBar",
-		components: {SampleMenu},
+		components: {UploadIndicator, SampleMenu},
 		data() {
 			return {}
 		},
@@ -24,7 +27,7 @@
 			...mapState([
 				'project'
 			]),
-			menu: function() {
+			menu: function () {
 				const menuConfig = this.$t('menu');
 				let menu = {};
 				for (let item of Object.keys(menuConfig)) {
@@ -43,7 +46,7 @@
 			clickMenu(menuItem) {
 				this.$emit('click-menu', menuItem);
 			},
-			editProjectName(){
+			editProjectName() {
 				this.$prompt(this.$t('Input project name'), this.$t('Rename project'), {
 					inputValue: this.project.name,
 					confirmButtonText: this.$t('Confirm'),

src/views/Editor/ToolBar/UploadIndicator.vue

+<template>
+	<div v-if="counting > 0" class="file-upload-indicator">
+		{{$t('Uploading')}}({{counting}})
+		<i class="el-icon-loading"></i>
+	</div>
+</template>
+
+<script>
+	import events from "../../../global-events";
+
+	export default {
+		name: "UploadIndicator",
+		data() {
+			return {
+				counting: 0,
+			}
+		},
+		mounted() {
+			events.$on('upload-indicator', this.onUploadIndicator);
+		},
+		destroyed() {
+			events.$off('upload-indicator', this.onUploadIndicator);
+		},
+		methods: {
+			onUploadIndicator(show) {
+				this.counting += show ? 1 : -1;
+			},
+		}
+	}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

src/views/Editor/Views.vue

@@ -3,17 +3,14 @@
 		<div class="container">
 			<div class="header-bar">
 				<el-link class="menu-item" @click="toAddView">{{$t('Add')}}</el-link>
-				<el-upload
-					class="menu-item import-file"
-					:action="importFileUrl"
-					name="file"
-					:headers="uploadHeaders"
-					:show-file-list="false"
-					:on-success="uploadFileSuccess"
-					:on-error="uploadFileError"
-				>
-					<el-link @click="toImportView">{{$t('Import')}}</el-link>
-				</el-upload>
+				<el-link @click="toImport(0)">{{$t('Import')}}</el-link>
+				<el-dropdown trigger="hover" placement="top" size="mini" @command="onImportCommand">
+					<i class="el-icon-arrow-down el-icon--right"></i>
+					<el-dropdown-menu slot="dropdown">
+						<el-dropdown-item command="single">{{$t('Single view')}}</el-dropdown-item>
+						<el-dropdown-item command="multi">{{$t('Multi views')}}</el-dropdown-item>
+					</el-dropdown-menu>
+				</el-dropdown>
 			</div>
 			<el-scrollbar class="tree-scrollbar" wrap-class="wrap-x-hidden">
 				<el-tree
@@ -22,10 +19,11 @@
 					:expand-on-click-node="false"
 					draggable
 					highlight-current
-					:default-expand-all="true"
+					:default-expand-all="false"
 					@node-click="handleNodeClick"
 					empty-text=""
 					:allow-drag="allowDrag"
+					:allow-drop="allowDrop"
 				>
 					<div slot-scope="{ node, data }" class="tree-node">
 						<div class="node-name">
@@ -55,13 +53,14 @@
 </template>
 
 <script>
-import { mapState, mapMutations, mapActions } from 'vuex';
-import Pane from '../../components/Pane';
-import { PARSE_BUNDLE_URL } from '../../config';
+	import {mapState, mapMutations, mapActions} from 'vuex';
+	import Pane from '../../components/Pane';
+	import {selectFile} from "../../utils";
+	import events from "../../global-events";
 
-export default {
+	export default {
 		name: 'Views',
-  components: { Pane },
+		components: {Pane},
 		data() {
 			return {
 				defaultProps: {
@@ -74,9 +73,6 @@ export default {
 			};
 		},
 		computed: {
-    importFileUrl() {
-      return PARSE_BUNDLE_URL;
-    },
 			...mapState({
 				views: state => state.project.data.views
 			})
@@ -85,11 +81,15 @@ export default {
 			allowDrag(draggingNode) {
 				return draggingNode.parent.parent;
 			},
+			allowDrop(draggingNode, dropNode, type) {
+				//console.log(dropNode.parent.parent, type);
+				return dropNode.parent.parent || type === 'inner';
+			},
 			/**
 			 * 点击左侧视图列表
 			 */
 			handleNodeClick(data, node) {
-      this.$store.dispatch('activeComponent', { data, node });
+				this.$store.dispatch('activeComponent', {data, node});
 			},
 			toAddView() {
 				this.$prompt(this.$t('Input view name'), this.$t('Alert'), {
@@ -98,16 +98,40 @@ export default {
 					inputPattern: /^.{1,64}$/,
 					inputErrorMessage: this.$t('Invalid view name')
 				})
-        .then(({ value }) => {
+					.then(({value}) => {
 						this.addNode({
 							name: value,
 							type: 'node'
 						});
 					})
-        .catch(() => {});
+					.catch(() => {
+					});
+			},
+			toImport(action) {
+				selectFile(async files => {
+					events.$emit('upload-indicator', true);
+					try {
+						await this.importView({
+							file: files[0],
+							action,
+						});
+					} catch (e) {
+					}
+					events.$emit('upload-indicator', false);
+				})
+			},
+			onImportCommand(command) {
+				let action;
+				switch (command) {
+					case 'single':
+						action = 0;
+						break;
+					case 'multi':
+						action = 1;
+						break;
+				}
+				this.toImport(action);
 			},
-    toImportView() {},
-    selectNode(data, node, target) {},
 			onMoreMenu(command, data, node) {
 				switch (command) {
 					case 'delete':
@@ -131,29 +155,10 @@ export default {
 						break;
 				}
 			},
-    uploadFileSuccess(response, file) {
-      if (response.success) {
-        console.log('upload success', response);
-        const { view, assets } = response.data;
-
-        this.importView(view);
-        this.importAssets(assets);
-      } else {
-        this.uploadFileError();
+			...mapMutations(['deleteNode', 'addNode']),
+			...mapActions(['exportView', 'importView'])
 		}
-    },
-    uploadFileError() {
-	    console.log('upload error');
-	    this.$message({
-		    message: this.$t('Upload view failed'),
-		    type: 'error',
-		    duration: 1000,
-	    });
-    },
-    ...mapMutations(['importView', 'importAssets', 'deleteNode', 'addNode']),
-    ...mapActions(['exportView'])
-  }
-};
+	};
 </script>
 
 <style scoped>

src/views/Editor/behavior-editor/inputs/DynamicInput.vue

 <template>
 	<input-wrapper :editable="editable" :value="value" :container="container" :property="property"
 	               :propertyName="propertyName">
-		<dynamic-selector style="flex: 1;" :input="value" @input="onChange"
+		<dynamic-selector style="flex: 1;" :value="value" @input="onChange"
 		               :editable="editable"
 		               :container="container"
 		               :property="property"

src/views/Editor/dialogs/BehaviorEditorDialog.vue

 <template>
 	<el-dialog :title="$t('Behavior Editor')" :visible.sync="visible" :before-close="beforeClose" @opened="onOpened"
-	           :fullscreen="true"
-	           :append-to-body="true" :close-on-click-modal="false" custom-class="behavior-editor-dialog">
+	           :fullscreen="true" :close-on-click-modal="false" :close-on-press-escape="false"
+	           :append-to-body="true" custom-class="behavior-editor-dialog">
 		<behavior-editor v-if="editorReady" ref="behaviorEditor" class="full-size"></behavior-editor>
 		<div slot="footer" class="dialog-footer">
 			<el-button size="mini" type="primary" @click="onSave">{{$t('Save')}}</el-button>

src/views/Home.vue

@@ -33,11 +33,11 @@
 								type="success" icon="el-icon-document-copy"
 								size="small" circle plain>
 							</el-button>
-							<el-button
+							<!--<el-button
 								@click.native.prevent="onDeleteProject(scope.row)"
 								type="danger" icon="el-icon-delete"
 								size="small" circle plain>
-							</el-button>
+							</el-button>-->
 						</template>
 					</el-table-column>
 				</el-table>

src/views/Home/DuplicateProjectDialog.vue

@@ -22,7 +22,8 @@
 			return {
 				visible: false,
 				project: {
-					name: ''
+					id: '',
+					name: '',
 				},
 				template: 'blank',
 				templates: {
@@ -39,6 +40,7 @@
 		methods: {
 			async show(project) {
 				this.project.name = project.name + '-' + this.$t('copy') + '-' + Math.floor(Math.random() * 10000);
+				this.project.id = project.id;
 				this.visible = true;
 			},
 			doCreateProject() {

自动合并.jsx

-/**
- * Created by rockyl on 2019-11-25.
- */
-
-var mergeFlagReg = /__m$/;
-
-var oldDocument = app.activeDocument;
-
-var mergeLayers = [];
-
-var document = oldDocument.duplicate(oldDocument.name + '-合并', 0);
-app.activeDocument = document;
-
-merge(document);
-
-function merge(document){
-	traverse(document, function(layer){
-		return layer.name.match(mergeFlagReg);
-	}, function(layer){
-		document.activeLayer = layer;
-
-		var newName = layer.name.replace(mergeFlagReg, '');
-		layer.name = newName;
-
-		mergeLayers.push(newName);
-
-		layer.merge();
-	});
-
-	if(mergeLayers.length > 0){
-		alert('合并的图层有: ' + mergeLayers.join(','));
-	}else{
-		alert('没有图层被合并');
-	}
-}
-
-function traverse(layer, filter, callback) {
-	if(layer.layers){
-		for (var i = 0; i < layer.layers.length; i++) {
-			var childLayer = layer.layers[i];
-			if (filter(childLayer)) {
-				callback(childLayer);
-			}else{
-				traverse(childLayer, filter, callback);
-			}
-		}
-	}
-}