From 63bf044a64583bc0a8e1c98f1aa3b6277b25e023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?= <1518079521@qq.com> Date: Tue, 10 Oct 2023 16:45:18 +0800 Subject: [PATCH] update --- admin/auto-imports.d.ts | 2 - admin/components.d.ts | 17 +------ admin/composer.json | 5 +++ admin/composer.lock | 98 +++++++++++++++++++++++++++++++++++++++++ admin/package.json | 1 + 5 files changed, 105 insertions(+), 18 deletions(-) create mode 100644 admin/composer.json create mode 100644 admin/composer.lock diff --git a/admin/auto-imports.d.ts b/admin/auto-imports.d.ts index 07b6235c0..8139ac907 100644 --- a/admin/auto-imports.d.ts +++ b/admin/auto-imports.d.ts @@ -2,6 +2,4 @@ export {} declare global { const ElMessage: typeof import('element-plus/es')['ElMessage'] - const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] - const ElNotification: typeof import('element-plus/es')['ElNotification'] } diff --git a/admin/components.d.ts b/admin/components.d.ts index de2ceb0e2..cfc399b1f 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -10,26 +10,20 @@ declare module '@vue/runtime-core' { Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default'] DiyLink: typeof import('./src/components/diy-link/index.vue')['default'] Editor: typeof import('./src/components/editor/index.vue')['default'] - ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] + ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElCol: typeof import('element-plus/es')['ElCol'] - ElCollapse: typeof import('element-plus/es')['ElCollapse'] - ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElContainer: typeof import('element-plus/es')['ElContainer'] - ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] - ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] - ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] ElDialog: typeof import('element-plus/es')['ElDialog'] - ElDivider: typeof import('element-plus/es')['ElDivider'] ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] @@ -42,24 +36,17 @@ declare module '@vue/runtime-core' { ElImage: typeof import('element-plus/es')['ElImage'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] - ElOptionGroup: typeof import('element-plus/es')['ElOptionGroup'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElResult: typeof import('element-plus/es')['ElResult'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSlider: typeof import('element-plus/es')['ElSlider'] - ElStatistic: typeof import('element-plus/es')['ElStatistic'] - ElStep: typeof import('element-plus/es')['ElStep'] - ElSteps: typeof import('element-plus/es')['ElSteps'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] @@ -68,8 +55,6 @@ declare module '@vue/runtime-core' { ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTree: typeof import('element-plus/es')['ElTree'] - ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] HeatMap: typeof import('./src/components/heat-map/index.vue')['default'] Icon: typeof import('./src/components/icon/index.vue')['default'] diff --git a/admin/composer.json b/admin/composer.json new file mode 100644 index 000000000..96328eb14 --- /dev/null +++ b/admin/composer.json @@ -0,0 +1,5 @@ +{ + "require": { + "mjaschen/phpgeo": "^4.2" + } +} diff --git a/admin/composer.lock b/admin/composer.lock new file mode 100644 index 000000000..8966b5f63 --- /dev/null +++ b/admin/composer.lock @@ -0,0 +1,98 @@ +{ + "_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.json b/admin/package.json index 6527b6166..83ea22006 100644 --- a/admin/package.json +++ b/admin/package.json @@ -27,6 +27,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"