From 61b9ad2288e651d12097c1998a73b94e892de65a Mon Sep 17 00:00:00 2001 From: FairyEver <1711467488@qq.com> Date: Mon, 19 Aug 2019 23:25:25 +0800 Subject: [PATCH] remove filters Former-commit-id: 98be7f49932856173f0a00f4e5468dc65526e8eb [formerly 98be7f49932856173f0a00f4e5468dc65526e8eb [formerly 98be7f49932856173f0a00f4e5468dc65526e8eb [formerly 98be7f49932856173f0a00f4e5468dc65526e8eb [formerly 26298ed935e1cc1aae9f32c9804f96891580ef2f [formerly e08f36b9a1962a87627f2724461daee3de0328d2]]]]] Former-commit-id: 80510c9b7017652ed708f70250029b75eddadb7e Former-commit-id: 79a6a2fd8888c3405676ce27f885cf412ded620c Former-commit-id: 4b36db262aded966d5057abbf131b78cead537e8 [formerly e8feec2bca77df8842569f27df41948a27d4e02f] Former-commit-id: ae8bd6b3b7ed83fdcfea77cb1327e9168fddb1c0 Former-commit-id: 9f1fac3bef99b0d85f52f2460b2af7680e80adb6 Former-commit-id: 9a706d4aab904611166baaed08e4f652ed1df4d5 Former-commit-id: f9e14db9d3d4af13b7690ebebba21147abeb5281 Former-commit-id: c8df3e28690ffb971c58c5924f5fdc9350fc5c24 --- package-lock.json.REMOVED.git-id | 2 +- package.json | 1 - packages/filters-date/.browserslistrc | 3 - packages/filters-date/.gitignore | 21 ---- packages/filters-date/.postcssrc.js | 5 - packages/filters-date/LICENSE | 21 ---- packages/filters-date/README.md | 1 - packages/filters-date/babel.config.js | 5 - .../package-lock.json.REMOVED.git-id | 1 - packages/filters-date/package.json | 18 ---- packages/filters-date/src/filters.js | 86 ---------------- packages/filters-date/src/main.js | 15 --- .../filters-date/yarn.lock.REMOVED.git-id | 1 - src/main.js | 3 - src/menu/index.js | 4 - src/menu/modules/demo-filters.js | 9 -- src/router/modules/filters.js | 28 ------ src/router/routes.js | 2 - .../day/components/code-and-result.vue | 69 ------------- .../filters/day/components/code-title.vue | 41 -------- src/views/demo/filters/day/index.vue | 97 ------------------- src/views/demo/filters/index/index.vue | 21 ---- yarn.lock.REMOVED.git-id | 1 - 23 files changed, 1 insertion(+), 454 deletions(-) delete mode 100644 packages/filters-date/.browserslistrc delete mode 100644 packages/filters-date/.gitignore delete mode 100644 packages/filters-date/.postcssrc.js delete mode 100644 packages/filters-date/LICENSE delete mode 100644 packages/filters-date/README.md delete mode 100644 packages/filters-date/babel.config.js delete mode 100644 packages/filters-date/package-lock.json.REMOVED.git-id delete mode 100644 packages/filters-date/package.json delete mode 100644 packages/filters-date/src/filters.js delete mode 100644 packages/filters-date/src/main.js delete mode 100644 packages/filters-date/yarn.lock.REMOVED.git-id delete mode 100644 src/menu/modules/demo-filters.js delete mode 100644 src/router/modules/filters.js delete mode 100644 src/views/demo/filters/day/components/code-and-result.vue delete mode 100644 src/views/demo/filters/day/components/code-title.vue delete mode 100644 src/views/demo/filters/day/index.vue delete mode 100644 src/views/demo/filters/index/index.vue delete mode 100644 yarn.lock.REMOVED.git-id diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id index 5fad0882..09d15757 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -0ec40645fbaa948452267003c25548620961d85e \ No newline at end of file +2d1d8a6a7dab70bae911bb5cd7870ee1ddb3274e \ No newline at end of file diff --git a/package.json b/package.json index 42e74c29..d73e8490 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { - "@d2-admin/filters-dayjs": "^1.0.3", "@d2-projects/d2-crud": "^2.1.1", "@d2-projects/vue-table-export": "^1.0.1", "@d2-projects/vue-table-import": "^1.0.0", diff --git a/packages/filters-date/.browserslistrc b/packages/filters-date/.browserslistrc deleted file mode 100644 index 9dee6464..00000000 --- a/packages/filters-date/.browserslistrc +++ /dev/null @@ -1,3 +0,0 @@ -> 1% -last 2 versions -not ie <= 8 diff --git a/packages/filters-date/.gitignore b/packages/filters-date/.gitignore deleted file mode 100644 index 185e6631..00000000 --- a/packages/filters-date/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -.DS_Store -node_modules -/dist - -# local env files -.env.local -.env.*.local - -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw* diff --git a/packages/filters-date/.postcssrc.js b/packages/filters-date/.postcssrc.js deleted file mode 100644 index 961986e2..00000000 --- a/packages/filters-date/.postcssrc.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - plugins: { - autoprefixer: {} - } -} diff --git a/packages/filters-date/LICENSE b/packages/filters-date/LICENSE deleted file mode 100644 index 4b66e078..00000000 --- a/packages/filters-date/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 李杨 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/filters-date/README.md b/packages/filters-date/README.md deleted file mode 100644 index ccd403a3..00000000 --- a/packages/filters-date/README.md +++ /dev/null @@ -1 +0,0 @@ -# filters-dayjs \ No newline at end of file diff --git a/packages/filters-date/babel.config.js b/packages/filters-date/babel.config.js deleted file mode 100644 index ba179669..00000000 --- a/packages/filters-date/babel.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - presets: [ - '@vue/app' - ] -} diff --git a/packages/filters-date/package-lock.json.REMOVED.git-id b/packages/filters-date/package-lock.json.REMOVED.git-id deleted file mode 100644 index c6ae258e..00000000 --- a/packages/filters-date/package-lock.json.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -47e4015bc9c97a986599c62beab09671eb49f756 \ No newline at end of file diff --git a/packages/filters-date/package.json b/packages/filters-date/package.json deleted file mode 100644 index dc658795..00000000 --- a/packages/filters-date/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "@d2-admin/filters-dayjs", - "version": "1.0.4", - "main": "dist/@d2-admin/filters-dayjs.common.js", - "scripts": { - "build": "vue-cli-service build --target lib --name @d2-admin/filters-dayjs --entry src/main.js" - }, - "dependencies": { - "core-js": "^2.6.5", - "dayjs": "^1.8.12", - "vue": "^2.6.6" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "^3.0.0", - "@vue/cli-service": "^3.0.0", - "vue-template-compiler": "^2.5.21" - } -} diff --git a/packages/filters-date/src/filters.js b/packages/filters-date/src/filters.js deleted file mode 100644 index 50e7d1c3..00000000 --- a/packages/filters-date/src/filters.js +++ /dev/null @@ -1,86 +0,0 @@ -// 日期时间相关 filter -// https://github.com/iamkun/dayjs/blob/master/docs/zh-cn/API-reference.md - -import dayjs from 'dayjs' - -// 对象代理 -const P = Day => { - return new Proxy(Day, { - get (target, key) { - if (dayjs.isDayjs(target)) { - // 是 Dayjs 对象，正常返回 - return target[key] - } else { - // 不是 Dayjs 对象 - if (dayjs(target).isValid()) { - // 尝试帮用户解析成 Dayjs 对象 - return dayjs(target)[key] - } else { - // 无法解析 - return function () { - return '无效日期' - } - } - } - }, - set (target, key, value) { - target[key] = value - } - }) -} - -export default { - // ---------- [ dayjs 解析 ] ---------- - // 时间字符串 | Date 对象 | Unix 时间戳 (毫秒) - day: value => dayjs(value), - // Unix 时间戳 (秒) - date_unix: value => dayjs.unix(value), - // ---------- [ 获取 ] ---------- - date_year: Day => P(Day).year(), - date_month: Day => P(Day).month(), - date_date: Day => P(Day).date(), - date_day: Day => P(Day).day(), - date_hour: Day => P(Day).hour(), - date_minute: Day => P(Day).minute(), - date_second: Day => P(Day).second(), - date_millisecond: Day => P(Day).millisecond(), - // ---------- [ 设置 ] ---------- - // date | day | month | year | hour | minute | second | millisecond - // 对大小写不敏感 - date_set: (Day, unit, value) => P(Day).set(unit, value), - // ---------- [ 操作 ] ---------- - // 增加 - date_add: (Day, value, unit) => P(Day).add(value, unit), - // 减少 - date_subtract: (Day, value, unit) => P(Day).subtract(value, unit), - // 开头时间 - date_startof: (Day, unit) => P(Day).startOf(unit), - // 末尾时间 - date_endof: (Day, unit) => P(Day).endOf(unit), - // ---------- [ 显示 ] ---------- - // 格式化 - date_format: (Day, setting = 'YYYY-MM-DD HH:mm:ss') => P(Day).format(setting), - // 时间差 - date_diff: (Day, Day2 = '', unit = 'millisecond', accurate = false) => P(Day).diff(dayjs(Day2), unit, accurate), - // Unix 时间戳 (毫秒) - date_value_millisecond: Day => P(Day).valueOf(), - // Unix 时间戳 (秒) - date_value_second: Day => P(Day).unix(), - // 月份的天数 - date_days_in_month: Day => P(Day).daysInMonth(), - // Date 对象 - date_to_date: Day => P(Day).toDate(), - // JSON - date_to_json: Day => P(Day).toJSON(), - // ISO8601 格式 - date_to_iso: Day => P(Day).toISOString(), - // 字符 - date_to_string: Day => P(Day).toString(), - // ---------- [ 查询 ] ---------- - // 是否之前 - date_is_before: (Day, Day2, unit = 'millisecond') => P(Day).isBefore(dayjs(Day2), unit), - // 是否之后 - date_is_after: (Day, Day2, unit = 'millisecond') => P(Day).isAfter(dayjs(Day2), unit), - // 是否相同 - date_is_same: (Day, Day2, unit = 'millisecond') => P(Day).isSame(dayjs(Day2), unit) -} diff --git a/packages/filters-date/src/main.js b/packages/filters-date/src/main.js deleted file mode 100644 index 9ce24973..00000000 --- a/packages/filters-date/src/main.js +++ /dev/null @@ -1,15 +0,0 @@ -import filters from './filters' - -const vueFiltersDate = { - install: function (Vue, options) { - Object.keys(filters).forEach(name => { - Vue.filter(name, filters[name]) - }) - } -} - -if (typeof window !== 'undefined' && window.Vue) { - window.Vue.use(vueFiltersDate) -} - -export default vueFiltersDate diff --git a/packages/filters-date/yarn.lock.REMOVED.git-id b/packages/filters-date/yarn.lock.REMOVED.git-id deleted file mode 100644 index 6233bc8b..00000000 --- a/packages/filters-date/yarn.lock.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -a22be8771a915cf974e7b76a1469d8f57f976f1c \ No newline at end of file diff --git a/src/main.js b/src/main.js index 7dfc3857..0c58c7a3 100644 --- a/src/main.js +++ b/src/main.js @@ -25,8 +25,6 @@ import VueUeditorWrap from 'vue-ueditor-wrap' // [ 可选插件 ] 数据导入导出 import pluginExport from '@d2-projects/vue-table-export' import pluginImport from '@d2-projects/vue-table-import' -// [ 可选过滤器 ] 日期相关过滤器 -import d2VueFiltersDayjs from '@d2-admin/filters-dayjs' // 菜单和路由设置 import router from './router' @@ -43,7 +41,6 @@ Vue.use(contentmenu) Vue.use(vueJsonTreeView) Vue.use(pluginExport) Vue.use(pluginImport) -Vue.use(d2VueFiltersDayjs) Vue.component('d2-grid-layout', GridLayout) Vue.component('d2-grid-item', GridItem) Vue.component('SplitPane', SplitPane) diff --git a/src/menu/index.js b/src/menu/index.js index 45df2abc..3c3a7684 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -6,8 +6,6 @@ import demoComponents from './modules/demo-components' import demoCharts from './modules/demo-charts' // 组件库 import demoElement from './modules/demo-element' -// 组件库 -import demoFilters from './modules/demo-filters' // 试验台 import demoPlayground from './modules/demo-playground' // 示例 @@ -23,7 +21,6 @@ export const menuAside = [ demoPlugins, demoCharts, demoElement, - demoFilters, demoPlayground, demoBusiness, demoD2Crud, @@ -43,7 +40,6 @@ export const menuHeader = [ children: [ demoD2Crud, demoComponents, - demoFilters, demoElement, demoCharts, demoPlugins, diff --git a/src/menu/modules/demo-filters.js b/src/menu/modules/demo-filters.js deleted file mode 100644 index 1430469c..00000000 --- a/src/menu/modules/demo-filters.js +++ /dev/null @@ -1,9 +0,0 @@ -export default { - path: '/demo/filters', - title: '内置过滤器', - icon: 'flask', - children: (pre => [ - { path: `${pre}index`, title: '内置过滤器', icon: 'home' }, - { path: `${pre}day`, title: '日期和时间', icon: 'calendar' } - ])('/demo/filters/') -} diff --git a/src/router/modules/filters.js b/src/router/modules/filters.js deleted file mode 100644 index 3c110e52..00000000 --- a/src/router/modules/filters.js +++ /dev/null @@ -1,28 +0,0 @@ -import layoutHeaderAside from '@/layout/header-aside' - -// 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载 -const _import = require('@/libs/util.import.' + process.env.NODE_ENV) - -const meta = { auth: true } - -export default { - path: '/demo/filters', - name: 'demo-filters', - meta, - redirect: { name: 'demo-filters-index' }, - component: layoutHeaderAside, - children: (pre => [ - { - path: 'index', - name: `${pre}index`, - component: _import('demo/filters/index'), - meta: { ...meta, title: '过滤器首页' } - }, - { - path: 'day', - name: `${pre}day`, - component: _import('demo/filters/day'), - meta: { ...meta, title: '日期和时间' } - } - ])('demo-filters-') -} diff --git a/src/router/routes.js b/src/router/routes.js index 30629236..a6b4b023 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -5,7 +5,6 @@ import plugins from './modules/plugins' import charts from './modules/charts' import components from './modules/components' import element from './modules/element' -import filters from './modules/filters' import business from './modules/business' import layoutHeaderAside from '@/layout/header-aside' @@ -64,7 +63,6 @@ const frameIn = [ charts, components, element, - filters, business ] diff --git a/src/views/demo/filters/day/components/code-and-result.vue b/src/views/demo/filters/day/components/code-and-result.vue deleted file mode 100644 index eb7b78a2..00000000 --- a/src/views/demo/filters/day/components/code-and-result.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - - - diff --git a/src/views/demo/filters/day/components/code-title.vue b/src/views/demo/filters/day/components/code-title.vue deleted file mode 100644 index 48eeec21..00000000 --- a/src/views/demo/filters/day/components/code-title.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - diff --git a/src/views/demo/filters/day/index.vue b/src/views/demo/filters/day/index.vue deleted file mode 100644 index e98d2bd3..00000000 --- a/src/views/demo/filters/day/index.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - diff --git a/src/views/demo/filters/index/index.vue b/src/views/demo/filters/index/index.vue deleted file mode 100644 index 1014e322..00000000 --- a/src/views/demo/filters/index/index.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/yarn.lock.REMOVED.git-id b/yarn.lock.REMOVED.git-id deleted file mode 100644 index 1663b7e9..00000000 --- a/yarn.lock.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -53a2534f94e1fbddf5d771247686935e6f70062b \ No newline at end of file