From ebded1885e059f07f1c5e2f4097d91abd1f447f2 Mon Sep 17 00:00:00 2001
From: liteng <930372551@qq.com>
Date: Sun, 7 Oct 2018 19:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E9=A2=91=E7=AA=97=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/editor/window/AudioWindow.js          | 242 ++++--------------
 .../src/editor/window/TextureWindow.js        |   6 +-
 2 files changed, 50 insertions(+), 198 deletions(-)

diff --git a/ShadowEditor.Web/src/editor/window/AudioWindow.js b/ShadowEditor.Web/src/editor/window/AudioWindow.js
index 916992c2..df77398c 100644
--- a/ShadowEditor.Web/src/editor/window/AudioWindow.js
+++ b/ShadowEditor.Web/src/editor/window/AudioWindow.js
@@ -1,228 +1,80 @@
 import UI from '../../ui/UI';
 import Ajax from '../../utils/Ajax';
-import AddObjectCommand from '../../command/AddObjectCommand';
 import UploadUtils from '../../utils/UploadUtils';
 
 /**
- * 音频窗口
+ * 纹理窗口
  * @author tengge / https://github.com/tengge1
  * @param {*} options 
  */
 function AudioWindow(options) {
-    UI.Control.call(this, options);
+    UI.ImageListWindow.call(this, options);
     this.app = options.app;
-    this.onSelect = options.onSelect;
 
-    this.list = [];
-    this.keyword = '';
+    this.title = '音频列表';
+    this.imageIcon = 'icon-audio';
+    // this.cornerTextField = 'Type';
+    this.uploadUrl = `${this.app.options.server}/api/Audio/Add`;
+    this.preImageUrl = this.app.options.server;
+    this.showUploadButton = true;
+
+    this.beforeUpdateList = this.beforeUpdateAudioList;
+    this.onUpload = this.onUploadAudio;
+    this.onClick = this.onClickAudio;
+    this.onEdit = this.onEditAudio;
+    this.onDelete = this.onDeleteAudio;
+
+    this.onSelect = options.onSelect || null;
 }
 
-AudioWindow.prototype = Object.create(UI.Control.prototype);
+AudioWindow.prototype = Object.create(UI.ImageListWindow.prototype);
 AudioWindow.prototype.constructor = AudioWindow;
 
-AudioWindow.prototype.render = function () {
-    var container = UI.create({
-        xtype: 'window',
-        id: 'window',
-        scope: this.id,
-        parent: this.app.container,
-        title: '音频列表',
-        width: '700px',
-        height: '500px',
-        bodyStyle: {
-            paddingTop: 0
-        },
-        shade: false,
-        children: [{
-            xtype: 'row',
-            style: {
-                position: 'sticky',
-                top: '0',
-                padding: '2px',
-                backgroundColor: '#eee',
-                borderBottom: '1px solid #ddd',
-                zIndex: 100,
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'flex-start'
-            },
-            children: [{
-                xtype: 'button',
-                text: '上传音频',
-                onClick: this.onAddFile.bind(this)
-            }, {
-                xtype: 'button',
-                text: '编辑分组'
-            }, {
-                xtype: 'toolbarfiller'
-            }, {
-                xtype: 'searchfield',
-                id: 'searchName',
-                scope: this.id,
-                showSearchButton: false,
-                showResetButton: true,
-                onInput: this.onClickSearchButton.bind(this)
-            }]
-        }, {
-            xtype: 'row',
-            children: [{
-                xtype: 'imagelist',
-                id: 'images',
-                scope: this.id,
-                style: {
-                    width: '100%',
-                    height: '100%',
-                },
-                onClick: this.onClickImage.bind(this)
-            }]
-        }]
-    });
-    container.render();
-};
+AudioWindow.prototype.beforeUpdateAudioList = function () {
+    var server = this.app.options.server;
 
-/**
- * 显示窗口
- */
-AudioWindow.prototype.show = function () {
-    UI.get('window', this.id).show();
-
-    this.keyword = '';
-    this.updateList();
-};
-
-/**
- * 隐藏窗口
- */
-AudioWindow.prototype.hide = function () {
-    UI.get('window', this.id).hide();
-};
-
-AudioWindow.prototype.updateList = function () {
-    var app = this.app;
-    var server = app.options.server;
-
-    Ajax.getJson(`${server}/api/Audio/List`, obj => {
-        this.list = obj.Data;
-        this.onSearch(this.keyword);
+    return new Promise(resolve => {
+        Ajax.getJson(`${server}/api/Audio/List`, obj => {
+            resolve(obj.Data);
+        });
     });
 };
 
-/**
- * 搜索文件
- * @param {*} name 
- */
-AudioWindow.prototype.onSearch = function (name) {
-    if (name.trim() === '') {
-        this.renderList(this.list);
-        return;
-    }
-
-    name = name.toLowerCase();
-
-    var list = this.list.filter(n => {
-        return n.Name.indexOf(name) > -1 ||
-            n.FirstPinYin.indexOf(name) > -1 ||
-            n.TotalPinYin.indexOf(name) > -1;
-    });
-    this.renderList(list);
+AudioWindow.prototype.onUploadAudio = function (obj) {
+    this.update();
+    UI.msg(obj.Msg);
 };
 
-AudioWindow.prototype.renderList = function (list) {
-    var images = UI.get('images', this.id);
-    images.clear();
-
-    images.children = list.map(n => {
-        return {
-            xtype: 'image',
-            title: n.Name,
-            data: n,
-            icon: 'icon-audio',
-            cornerText: n.Type,
-            style: {
-                backgroundColor: '#eee'
-            }
-        };
-    });;
-
-    images.render();
-};
-
-/**
- * 点击上传按钮
- */
-AudioWindow.prototype.onAddFile = function () {
-    var input = document.getElementById(`${this.id}-fileInput`);
-    if (input == null) {
-        input = document.createElement('input');
-        input.id = `${this.id}-fileInput`;
-        input.type = 'file';
-        document.body.appendChild(input);
-        input.onchange = this.onUploadFile.bind(this);
-    }
-    input.click();
-};
-
-AudioWindow.prototype.onUploadFile = function (event) {
-    UploadUtils.upload(`${this.id}-fileInput`, `${this.app.options.server}/api/Audio/Add`, e => {
-        document.getElementById(`${this.id}-fileInput`).value = null;
-        if (e.target.status === 200) {
-            var obj = JSON.parse(e.target.responseText);
-            if (obj.Code === 200) {
-                this.updateList();
-            }
-            UI.msg(obj.Msg);
-        } else {
-            UI.msg('服务器错误！');
-        }
-    });
-};
-
-/**
- * 点击搜索按钮
- */
-AudioWindow.prototype.onClickSearchButton = function () {
-    var name = UI.get('searchName', this.id);
-    this.onSearch(name.getValue());
-};
-
-/**
- * 点击图片列表
- * @param {*} event 
- * @param {*} index 
- * @param {*} btn 
- * @param {*} imgs 
- */
-AudioWindow.prototype.onClickImage = function (event, index, btn, imgs) {
-    event.preventDefault();
-    event.stopPropagation();
-
-    var data = imgs.children[index].data;
-
-    if (btn === 'edit') {
-        UI.msg('开始编辑');
-    } else if (btn === 'delete') {
-        this.onDelete(data);
-    } else if (typeof (this.onSelect) === 'function') {
+AudioWindow.prototype.onClickAudio = function (data) {
+    if (typeof (this.onSelect) === 'function') {
         this.onSelect(data);
     } else {
-        UI.msg('请在属性窗口添加音频！');
+        UI.msg('请在音频相关控件中修改音乐。');
     }
 };
 
-/**
- * 删除
- * @param {*} model 
- */
-AudioWindow.prototype.onDelete = function (model) {
-    var app = this.app;
-    var server = app.options.server;
+AudioWindow.prototype.onEditAudio = function (data) {
+    if (this.editWindow === undefined) {
+        this.editWindow = new TextureEditWindow({
+            app: this.app,
+            parent: this.parent,
+            callback: this.update.bind(this)
+        });
+        this.editWindow.render();
+    }
+    this.editWindow.setData(data);
+    this.editWindow.show();
+};
 
-    UI.confirm('询问', '是否删除？', (event, btn) => {
+AudioWindow.prototype.onDeleteAudio = function (data) {
+    var server = this.app.options.server;
+
+    UI.confirm('询问', `是否删除音频${data.Name}？`, (event, btn) => {
         if (btn === 'ok') {
-            Ajax.post(`${server}/api/Audio/Delete?ID=${model.ID}`, json => {
+            Ajax.post(`${server}/api/Audio/Delete?ID=${data.ID}`, json => {
                 var obj = JSON.parse(json);
                 if (obj.Code === 200) {
-                    this.updateList();
+                    this.update();
                 }
                 UI.msg(obj.Msg);
             });
diff --git a/ShadowEditor.Web/src/editor/window/TextureWindow.js b/ShadowEditor.Web/src/editor/window/TextureWindow.js
index d0230fd8..d40ec5bd 100644
--- a/ShadowEditor.Web/src/editor/window/TextureWindow.js
+++ b/ShadowEditor.Web/src/editor/window/TextureWindow.js
@@ -14,12 +14,12 @@ function TextureWindow(options) {
 
     this.title = '纹理列表';
     this.imageIcon = 'icon-texture';
-    this.cornerTextField = 'Type';
+    // this.cornerTextField = 'Type';
     this.uploadUrl = `${this.app.options.server}/api/Texture/Add`;
     this.preImageUrl = this.app.options.server;
     this.showUploadButton = true;
 
-    this.beforeUpdateList = this.beforeUpdateSceneList;
+    this.beforeUpdateList = this.beforeUpdateTextureList;
     this.onUpload = this.onUploadTexture;
     this.onClick = this.onClickTexture;
     this.onEdit = this.onEditTexture;
@@ -29,7 +29,7 @@ function TextureWindow(options) {
 TextureWindow.prototype = Object.create(UI.ImageListWindow.prototype);
 TextureWindow.prototype.constructor = TextureWindow;
 
-TextureWindow.prototype.beforeUpdateSceneList = function () {
+TextureWindow.prototype.beforeUpdateTextureList = function () {
     var server = this.app.options.server;
 
     return new Promise(resolve => {