diff --git a/.travis.yml b/.travis.yml index 251c5f4..0f93df6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ script: -v ~/.cache/electron-builder:/root/.cache/electron-builder \ electronuserland/builder:wine \ /bin/bash -c "npm install && npm run electron:build -- --bundler builder --target linux" + ls dist/electron/Packaged/ linux_file=`ls dist/electron/Packaged/ | grep '.AppImage$'` ./ossutil64 cp "dist/electron/Packaged/${linux_file}" "${BUCKET}/${linux_file}" -f @@ -59,10 +60,14 @@ script: -v ~/.cache/electron-builder:/root/.cache/electron-builder \ electronuserland/builder:wine \ /bin/bash -c "npm install && npm run electron:build -- --bundler builder --target win" - win_file=`ls dist/electron/Packaged/ | grep '.zip$'` - ./ossutil64 cp "dist/electron/Packaged/${win_file}" "${BUCKET}/${win_file}" -f + ls dist/electron/Packaged/ + for i in `ls dist/electron/Packaged/ | grep 'win.zip$'`; + do + ./ossutil64 cp "dist/electron/Packaged/$i" "${BUCKET}/$i" -f + done else npm run electron:build + ls dist/electron/Packaged/ osx_file=`ls dist/electron/Packaged/ | grep '.dmg$'` ./ossutilmac64 cp "dist/electron/Packaged/${osx_file}" "${BUCKET}/${osx_file}" -f fi diff --git a/package.json b/package.json index 38ac029..90e61fd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "h-player", - "version": "0.9.4", + "version": "0.9.5", "description": "A Quasar Framework app", "productName": "h-player", "cordovaId": "org.cordova.quasar.app", @@ -29,6 +29,7 @@ "vue-i18n": "^8.14.1", "vue-navigation": "^1.1.4", "vue-rx": "^6.2.0", + "vuedraggable": "^2.23.0", "xml2js": "^0.4.22" }, "devDependencies": { diff --git a/quasar.conf.js b/quasar.conf.js index 3dc5a20..07f1a84 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -208,7 +208,15 @@ module.exports = function (ctx) { target: 'dmg', }, win: { - target: 'zip', + target: [ + { + target: 'zip', + arch: [ + 'x64', + 'ia32', + ], + }, + ], }, linux: { target: 'AppImage', diff --git a/src/layouts/Config.vue b/src/layouts/Config.vue index a3e73d9..2d19072 100644 --- a/src/layouts/Config.vue +++ b/src/layouts/Config.vue @@ -26,526 +26,30 @@ - - - - 视频源设置 - - - - - - - - - - - - - - - - - - {{ props.row.id }} - - {{ props.row.name }} - - - - - - {{ props.row.uri }} - - - - - - {{ props.row.httpApi }} - - - - - - {{ props.row.httpsApi }} - - - - - - {{ props.row.type }} - - - - - - - - - - - - - - name - - - - - - - url - - - - - - - httpApi - - - - - - - httpsApi - - - - - - - type - - - - - - - - - - - - - - - - - - - - - - - 清空视频源后需要重新导入或添加,请确定已备份当前视频源 - - - - - - - - - - 全局设置 - - - - - - - - - - - 软件信息 - - - - 当前版本: - {{currentVersion}} - - - 最新版本: - {{latestVersion}} - - - - - - - - - - - + diff --git a/src/pages/config/components/dndSort.vue b/src/pages/config/components/dndSort.vue new file mode 100644 index 0000000..1c1ca1a --- /dev/null +++ b/src/pages/config/components/dndSort.vue @@ -0,0 +1,102 @@ + + + + + + + {{ element.name }} + + + + + + + + + diff --git a/src/pages/config/index.vue b/src/pages/config/index.vue new file mode 100644 index 0000000..7568aed --- /dev/null +++ b/src/pages/config/index.vue @@ -0,0 +1,585 @@ + + + + + 视频源设置 + + + + + + + + + + + + + + + + + + + {{ props.row.id }} + + {{ props.row.name }} + + + + + + {{ props.row.uri }} + + + + + + {{ props.row.httpApi }} + + + + + + {{ props.row.httpsApi }} + + + + + + {{ props.row.type }} + + + + + + + + + + + + + + 添加视频源 + + + + + + + + + + + + + + + + + + + + 拖动排序 + + + + + + + + + + + + + + + + + + + + + + + 清空视频源后需要重新导入或添加,请确定已备份当前视频源 + + + + + + + + + + 全局设置 + + + + + + + + + + + 软件信息 + + + + 当前版本: + {{currentVersion}} + + + 最新版本: + {{latestVersion}} + + + + + + + + + + + + + + + + diff --git a/src/router/routes.js b/src/router/routes.js index abfc0e1..db75c92 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -24,7 +24,7 @@ const routes = [ { path: '/config', component: () => import('layouts/Config'), - // children: [{ path: '', component: () => import('pages/MiniVideo') }], + children: [{ path: '', component: () => import('pages/config') }], }, ]; diff --git a/yarn.lock b/yarn.lock index e6bb640..ecb10f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8561,6 +8561,11 @@ sort-keys@^1.0.0: dependencies: is-plain-obj "^1.0.0" +sortablejs@^1.9.0: + version "1.10.0" + resolved "https://registry.npm.taobao.org/sortablejs/download/sortablejs-1.10.0.tgz?cache=0&sync_timestamp=1568575491802&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsortablejs%2Fdownload%2Fsortablejs-1.10.0.tgz#0ebc054acff2486569194a2f975b2b145dd5e7d6" + integrity sha1-DrwFSs/ySGVpGUovl1srFF3V59Y= + source-list-map@^2.0.0: version "2.0.1" resolved "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" @@ -9703,6 +9708,13 @@ vue@2.6.10: resolved "https://registry.npm.taobao.org/vue/download/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637" integrity sha1-pysaQqTYKnIepDjRtr9V5mGVxjc= +vuedraggable@^2.23.0: + version "2.23.0" + resolved "https://registry.npm.taobao.org/vuedraggable/download/vuedraggable-2.23.0.tgz#1f4a5a601675a5dbf0d96ee61aebfffa43445262" + integrity sha1-H0paYBZ1pdvw2W7mGuv/+kNEUmI= + dependencies: + sortablejs "^1.9.0" + vuex@3.1.1: version "3.1.1" resolved "https://registry.npm.taobao.org/vuex/download/vuex-3.1.1.tgz#0c264bfe30cdbccf96ab9db3177d211828a5910e"