diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id index 7347e8cb..97098837 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -14be1e768a4e072ad8ea5ff5bfec5535088a3e4b \ No newline at end of file +2b614609fc8311fc059d290422304b490e9a3abc \ No newline at end of file diff --git a/package.json b/package.json index a0ec1396..96d39b4c 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,9 @@ }, "dependencies": { "@d2-projects/d2-crud": "^1.3.4", + "@d2-projects/vue-filters-date": "^1.0.2", + "@d2-projects/vue-table-export": "^1.0.1", + "@d2-projects/vue-table-import": "^1.0.0", "axios": "^0.17.1", "babel-polyfill": "^6.26.0", "better-scroll": "^1.12.1", @@ -22,7 +25,6 @@ "dayjs": "^1.6.7", "echarts": "^4.1.0", "element-ui": "^2.4.4", - "file-saver": "^1.3.3", "flex.css": "^1.1.7", "fuse.js": "^3.2.1", "github-markdown-css": "^2.10.0", @@ -34,7 +36,6 @@ "marked": "^0.3.9", "mockjs": "^1.0.1-beta3", "nprogress": "^0.2.0", - "papaparse": "^4.3.6", "qs": "^6.6.0", "quill": "^1.3.4", "screenfull": "^3.3.2", @@ -49,8 +50,7 @@ "vue-router": "^3.0.1", "vue-splitpane": "^1.0.2", "vue-ueditor-wrap": "^1.5.0", - "vuex": "^3.0.1", - "xlsx": "^0.12.0" + "vuex": "^3.0.1" }, "devDependencies": { "@kazupon/vue-i18n-loader": "^0.3.0", diff --git a/src/libs/db.js b/src/libs/util.db.js similarity index 100% rename from src/libs/db.js rename to src/libs/util.db.js diff --git a/src/libs/util.js b/src/libs/util.js index af73d10e..9711c6a9 100644 --- a/src/libs/util.js +++ b/src/libs/util.js @@ -1,8 +1,10 @@ -import log from './util.log.js' -import cookies from './util.cookies.js' +import cookies from './util.cookies' +import db from './util.db' +import log from './util.log' -let util = { +const util = { cookies, + db, log } @@ -23,10 +25,10 @@ util.open = function (url) { var a = document.createElement('a') a.setAttribute('href', url) a.setAttribute('target', '_blank') - a.setAttribute('id', 'd2admin-menu-link') + a.setAttribute('id', 'd2admin-link-temp') document.body.appendChild(a) a.click() - document.body.removeChild(document.getElementById('d2admin-menu-link')) + document.body.removeChild(document.getElementById('d2admin-link-temp')) } export default util diff --git a/src/menu/index.js b/src/menu/index.js index 3c3a7684..45df2abc 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -6,6 +6,8 @@ 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' // 示例 @@ -21,6 +23,7 @@ export const menuAside = [ demoPlugins, demoCharts, demoElement, + demoFilters, demoPlayground, demoBusiness, demoD2Crud, @@ -40,6 +43,7 @@ export const menuHeader = [ children: [ demoD2Crud, demoComponents, + demoFilters, demoElement, demoCharts, demoPlugins, diff --git a/src/menu/modules/demo-business.js b/src/menu/modules/demo-business.js index 71b01f37..736696f9 100644 --- a/src/menu/modules/demo-business.js +++ b/src/menu/modules/demo-business.js @@ -3,7 +3,7 @@ export default { title: '示例', icon: 'flask', children: (pre => [ - { path: `${pre}index`, title: '示例首页', icon: 'home' }, + { path: `${pre}index`, title: '示例', icon: 'home' }, { title: '表格', icon: 'table', diff --git a/src/menu/modules/demo-charts.js b/src/menu/modules/demo-charts.js index 3daa018e..bfd808cd 100644 --- a/src/menu/modules/demo-charts.js +++ b/src/menu/modules/demo-charts.js @@ -3,7 +3,7 @@ export default { title: '图表', icon: 'line-chart', children: (pre => [ - { path: `${pre}index`, title: '图表首页', icon: 'home' }, + { path: `${pre}index`, title: '图表', icon: 'home' }, { path: `${pre}list`, title: '图表', diff --git a/src/menu/modules/demo-components.js b/src/menu/modules/demo-components.js index f4ebd4a7..c2780b5c 100644 --- a/src/menu/modules/demo-components.js +++ b/src/menu/modules/demo-components.js @@ -3,7 +3,7 @@ export default { title: '内置组件', icon: 'puzzle-piece', children: (pre => [ - { path: `${pre}index`, title: '扩展组件首页', icon: 'home' }, + { path: `${pre}index`, title: '扩展组件', icon: 'home' }, { path: `${pre}container`, title: '布局容器', diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 1d86836a..3300bb08 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -3,7 +3,7 @@ export default { title: 'D2 CRUD', iconSvg: 'd2-crud', children: (pre => [ - { path: `${pre}index`, title: 'D2 CRUD 首页', icon: 'home' }, + { path: `${pre}index`, title: 'D2 CRUD ', icon: 'home' }, { title: '基础功能', children: [ diff --git a/src/menu/modules/demo-element.js b/src/menu/modules/demo-element.js index d38c5d35..b2d396b2 100644 --- a/src/menu/modules/demo-element.js +++ b/src/menu/modules/demo-element.js @@ -3,7 +3,7 @@ export default { title: '基础组件库', icon: 'cubes', children: (pre => [ - { path: `${pre}index`, title: '基础组件库首页', icon: 'home' }, + { path: `${pre}index`, title: '基础组件库', icon: 'home' }, { path: `${pre}basic`, title: '基础', diff --git a/src/menu/modules/demo-filters.js b/src/menu/modules/demo-filters.js new file mode 100644 index 00000000..1430469c --- /dev/null +++ b/src/menu/modules/demo-filters.js @@ -0,0 +1,9 @@ +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/menu/modules/demo-frame.js b/src/menu/modules/demo-frame.js index 63e81a5a..11cc44d2 100644 --- a/src/menu/modules/demo-frame.js +++ b/src/menu/modules/demo-frame.js @@ -3,7 +3,7 @@ export default { title: '内嵌网页', icon: 'globe', children: (pre => [ - { path: `${pre}index`, title: 'Frame 首页', icon: 'home' }, + { path: `${pre}index`, title: 'Frame ', icon: 'home' }, { path: `${pre}d2-doc`, title: 'D2Admin 中文文档', iconSvg: 'd2-admin' }, { path: `${pre}html`, title: '静态 HTML', icon: 'code' } ])('/demo/frame/') diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js index eb84d2d9..1c884574 100644 --- a/src/menu/modules/demo-playground.js +++ b/src/menu/modules/demo-playground.js @@ -3,7 +3,7 @@ export default { title: '试验台', icon: 'flask', children: (pre => [ - { path: `${pre}index`, title: '试验台首页', icon: 'home' }, + { path: `${pre}index`, title: '试验台', icon: 'home' }, { title: 'svg 菜单图标', iconSvg: 'd2-admin', diff --git a/src/menu/modules/demo-plugins.js b/src/menu/modules/demo-plugins.js index 22105b1f..d674975a 100644 --- a/src/menu/modules/demo-plugins.js +++ b/src/menu/modules/demo-plugins.js @@ -3,7 +3,7 @@ export default { title: '插件', icon: 'plug', children: (pre => [ - { path: `${pre}index`, title: '插件首页', icon: 'home' }, + { path: `${pre}index`, title: '插件', icon: 'home' }, { path: `${pre}mock`, title: '模拟数据', diff --git a/src/pages/demo/business/issues/142/edit.vue b/src/pages/demo/business/issues/142/edit.vue index a2d6c709..36b310fa 100644 --- a/src/pages/demo/business/issues/142/edit.vue +++ b/src/pages/demo/business/issues/142/edit.vue @@ -40,8 +40,7 @@ export default { vm.resetFormData() vm.getFormData(id) }) - } - else { + } else { next(new Error('未指定ID')) } }, diff --git a/src/pages/demo/business/issues/142/index.vue b/src/pages/demo/business/issues/142/index.vue index b8f777b1..5c33e558 100644 --- a/src/pages/demo/business/issues/142/index.vue +++ b/src/pages/demo/business/issues/142/index.vue @@ -59,7 +59,9 @@ export default { // 请求表格数据 getTableData () { fetch() - .then(res => this.crud.data = res.list) + .then(res => { + this.crud.data = res.list + }) .catch(err => console.log(err)) }, // 跳转到编辑页面 diff --git a/src/pages/demo/filters/day/components/code-and-result.vue b/src/pages/demo/filters/day/components/code-and-result.vue new file mode 100644 index 00000000..b3c1fb50 --- /dev/null +++ b/src/pages/demo/filters/day/components/code-and-result.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/pages/demo/filters/day/components/code-title.vue b/src/pages/demo/filters/day/components/code-title.vue new file mode 100644 index 00000000..48eeec21 --- /dev/null +++ b/src/pages/demo/filters/day/components/code-title.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/pages/demo/filters/day/index.vue b/src/pages/demo/filters/day/index.vue new file mode 100644 index 00000000..2ba47239 --- /dev/null +++ b/src/pages/demo/filters/day/index.vue @@ -0,0 +1,95 @@ + + + diff --git a/src/pages/demo/filters/index/index.vue b/src/pages/demo/filters/index/index.vue new file mode 100644 index 00000000..659102ec --- /dev/null +++ b/src/pages/demo/filters/index/index.vue @@ -0,0 +1,22 @@ + + + diff --git a/src/pages/demo/playground/db/all/index.vue b/src/pages/demo/playground/db/all/index.vue index 02d7a711..e1de19c4 100644 --- a/src/pages/demo/playground/db/all/index.vue +++ b/src/pages/demo/playground/db/all/index.vue @@ -16,7 +16,7 @@