diff --git a/.gitignore b/.gitignore index 4fcf27a69..4548755dd 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ bin-release/ # should NOT be excluded as they contain compiler settings and other important # information for Eclipse / Flash Builder. +/.idea +niucloud/public/.htaccess +admin/.env.development \ No newline at end of file diff --git a/admin/.gitignore b/admin/.gitignore index a547bf36d..5998958b1 100644 --- a/admin/.gitignore +++ b/admin/.gitignore @@ -22,3 +22,5 @@ dist-ssr *.njsproj *.sln *.sw? +.env.development +.env.production \ No newline at end of file diff --git a/admin/.vscode/extensions.json b/admin/.vscode/extensions.json deleted file mode 100644 index c0a6e5a48..000000000 --- a/admin/.vscode/extensions.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"] -} diff --git a/admin/composer.json b/admin/composer.json deleted file mode 100644 index 96328eb14..000000000 --- a/admin/composer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "require": { - "mjaschen/phpgeo": "^4.2" - } -} diff --git a/admin/composer.lock b/admin/composer.lock deleted file mode 100644 index 8966b5f63..000000000 --- a/admin/composer.lock +++ /dev/null @@ -1,98 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "59ab9c105da56884a02f809bf612a82c", - "packages": [ - { - "name": "mjaschen/phpgeo", - "version": "4.2.0", - "source": { - "type": "git", - "url": "https://github.com/mjaschen/phpgeo.git", - "reference": "b2e593cf1e9aceea36510158ddb80c7395a80d5a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mjaschen/phpgeo/zipball/b2e593cf1e9aceea36510158ddb80c7395a80d5a", - "reference": "b2e593cf1e9aceea36510158ddb80c7395a80d5a", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": "^7.3 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.5", - "squizlabs/php_codesniffer": "^3.6", - "vimeo/psalm": "^4.13" - }, - "type": "library", - "autoload": { - "psr-4": { - "Location\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marcus Jaschen", - "email": "mjaschen@gmail.com", - "homepage": "https://www.marcusjaschen.de/" - } - ], - "description": "Simple Yet Powerful Geo Library", - "homepage": "https://phpgeo.marcusjaschen.de/", - "keywords": [ - "Polygon", - "area", - "bearing", - "bounds", - "calculation", - "coordinate", - "distance", - "earth", - "ellipsoid", - "geo", - "geofence", - "gis", - "gps", - "haversine", - "length", - "perpendicular", - "point", - "polyline", - "projection", - "simplify", - "track", - "vincenty" - ], - "support": { - "docs": "https://phpgeo.marcusjaschen.de/Installation.html", - "email": "mjaschen@gmail.com", - "issues": "https://github.com/mjaschen/phpgeo/issues", - "source": "https://github.com/mjaschen/phpgeo/tree/4.2.0" - }, - "time": "2022-07-25T08:36:36+00:00" - } - ], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": [], - "platform-dev": [], - "plugin-api-version": "2.3.0" -} diff --git a/admin/package-lock.json b/admin/package-lock.json index 282cd5399..0ab5c7127 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -26,6 +26,7 @@ "sortablejs": "^1.15.0", "vue": "^3.2.45", "vue-i18n": "^9.2.2", + "vue-jsonp": "^2.0.0", "vue-router": "^4.1.6", "vue-web-terminal": "^3.1.7", "vue3-video-play": "^1.3.1-beta.6" @@ -6244,6 +6245,11 @@ "vue": "^3.2.2" } }, + "node_modules/vue-jsonp": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/vue-jsonp/-/vue-jsonp-2.0.0.tgz", + "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==" + }, "node_modules/vue-router": { "version": "4.1.6", "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.1.6.tgz", @@ -11364,6 +11370,11 @@ "clipboard": "^2.0.4" } }, + "vue-jsonp": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/vue-jsonp/-/vue-jsonp-2.0.0.tgz", + "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==" + }, "vue-router": { "version": "4.1.6", "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.1.6.tgz", diff --git a/admin/src/app/lang/zh-cn/diy.index.json b/admin/src/app/lang/zh-cn/diy.index.json index e5c543666..3ff1eecfd 100644 --- a/admin/src/app/lang/zh-cn/diy.index.json +++ b/admin/src/app/lang/zh-cn/diy.index.json @@ -16,6 +16,7 @@ "refreshPage": "刷新", "placeholderTemplate": "请选择一个模板", "placeholderMyPage": "请选择一个微页面", + "placeholderOtherPage": "请选择一个页面", "developTitle": "开发环境配置", "wapDomain": "wap域名（WAP_DOMAIN）", "wapDomainPlaceholder": "请输入wap域名" diff --git a/admin/src/app/lang/zh-cn/index.store.json b/admin/src/app/lang/zh-cn/index.store.json index 686d5f21c..4e6938427 100644 --- a/admin/src/app/lang/zh-cn/index.store.json +++ b/admin/src/app/lang/zh-cn/index.store.json @@ -65,5 +65,6 @@ "authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看", "addonUninstall": "插件卸载", "appIdentification":"应用标识", - "tipText":"标识指开发应用或插件的文件夹名称" + "tipText":"标识指开发应用或插件的文件夹名称", + "uninstallTips": "卸载插件将会移除admin web uni-app目录下该插件的内容，是否要继续进行卸载？" } \ No newline at end of file diff --git a/admin/src/app/views/app/authorize.vue b/admin/src/app/views/app/authorize.vue index dd5cd5f5e..26c564c02 100644 --- a/admin/src/app/views/app/authorize.vue +++ b/admin/src/app/views/app/authorize.vue @@ -166,7 +166,6 @@ const save = async (formEl: FormInstance | undefined) => { }) .catch(() => { saveLoading.value = false - authCodeApproveDialog.value = false }) } }) diff --git a/admin/src/app/views/diy/index.vue b/admin/src/app/views/diy/index.vue index b742bc8e6..075fd740e 100644 --- a/admin/src/app/views/diy/index.vue +++ b/admin/src/app/views/diy/index.vue @@ -112,6 +112,7 @@ // 添加自定义页面 const formData = reactive({ type: '', + name: '', mode: '', template: '', id: '', @@ -123,6 +124,7 @@ // 初始化数据 const refreshData = () => { formData.type = ''; + formData.name = ''; formData.mode = ''; formData.template = ''; formData.id = ''; @@ -246,6 +248,7 @@ hope.value = data.use_template.hope; formData.type = key; + formData.name = data.use_template.name; formData.mode = data.use_template.mode; formData.action = data.use_template.action; @@ -326,15 +329,20 @@ (newValue, oldValue) => { // 选择某个，清空其余 if (newValue == 'template') { + // 选择模板 formData.id = ''; formData.page = ''; formData.action = 'decorate'; + formData.name = formData.type; } else if (newValue == 'diy') { + // 选择微页面 formData.mode = 'diy'; formData.template = ''; formData.page = ''; formData.action = 'decorate'; + formData.name = formData.type; } else if (newValue == 'other') { + // 选择其他页面 formData.mode = 'other'; formData.template = ''; formData.id = ''; @@ -342,6 +350,7 @@ } ) + // 监听模板变化 watch( () => formData.template, (newValue, oldValue) => { @@ -351,12 +360,14 @@ } ) + // 监听其他页面 watch( () => formData.page, (newValue, oldValue) => { if (newValue) { for (let i = 0; i < page[formData.type].other_page.length; i++) { if (page[formData.type].other_page[i].page == newValue) { + formData.name = page[formData.type].other_page[i].name; formData.title = page[formData.type].other_page[i].title; formData.action = page[formData.type].other_page[i].action; break; @@ -384,6 +395,14 @@ }); return; } + } else if (hope.value == 'other') { + if (formData.page == '') { + ElMessage({ + type: 'warning', + message: `${t('placeholderOtherPage')}`, + }); + return; + } } if (isRepeat.value) return diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue index 3f66ccd71..e1ba426c8 100644 --- a/admin/src/app/views/index/store.vue +++ b/admin/src/app/views/index/store.vue @@ -12,18 +12,18 @@
-
{{ t('installLabel') }}
-
{{ t('uninstalledLabel') }}
-
{{ t('buyLabel') }}
@@ -98,8 +98,7 @@ - + - +