From 57d1148da822d1fb2397ebbc070e40b266079b68 Mon Sep 17 00:00:00 2001 From: chenwei Date: Wed, 21 Aug 2024 17:33:39 +0800 Subject: [PATCH] update --- frontend/front/amis.copy.js | 23 +++++++++++++++++++++++ frontend/front/jsconfig.json | 9 +++++++++ frontend/front/src/api/amis.js | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/front/src/assets/index_images/count.png | Bin 0 -> 1558 bytes frontend/front/src/assets/index_images/count_active.png | Bin 0 -> 1158 bytes frontend/front/src/assets/index_images/homePage.png | Bin 0 -> 1042 bytes frontend/front/src/assets/index_images/homePage_active.png | Bin 0 -> 796 bytes frontend/front/src/assets/index_images/implement.png | Bin 0 -> 1320 bytes frontend/front/src/assets/index_images/implement_active.png | Bin 0 -> 982 bytes frontend/front/src/assets/index_images/index.js | 35 +++++++++++++++++++++++++++++++++++ frontend/front/src/assets/index_images/matter_.png | Bin 0 -> 1431 bytes frontend/front/src/assets/index_images/matter__active.png | Bin 0 -> 1051 bytes frontend/front/src/assets/index_images/meeting.png | Bin 0 -> 1957 bytes frontend/front/src/assets/index_images/meeting_active.png | Bin 0 -> 1417 bytes frontend/front/src/assets/index_images/report.png | Bin 0 -> 1032 bytes frontend/front/src/assets/index_images/report_active.png | Bin 0 -> 736 bytes frontend/front/src/assets/index_images/rule.png | Bin 0 -> 1660 bytes frontend/front/src/assets/index_images/rule_active.png | Bin 0 -> 1146 bytes frontend/front/src/assets/index_images/setup.png | Bin 0 -> 2205 bytes frontend/front/src/assets/index_images/setup_active.png | Bin 0 -> 1565 bytes frontend/front/src/assets/index_images/side_bg.png | Bin 0 -> 198995 bytes frontend/front/src/assets/login_images/login_logo.png | Bin 0 -> 333432 bytes frontend/front/src/components/amisContainer/AMISRenderer.vue | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/front/src/components/amisContainer/index.vue | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/front/src/components/layouts/HtTabsBar/index.vue | 33 +++++++++++++++++++++------------ frontend/front/src/router/index.js | 14 ++++++++++++++ frontend/front/src/styles/custom.css | 17 +++++++++++++++++ frontend/front/src/styles/flex.scss | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 28 files changed, 563 insertions(+), 12 deletions(-) create mode 100644 frontend/front/amis.copy.js create mode 100644 frontend/front/jsconfig.json create mode 100644 frontend/front/src/api/amis.js create mode 100644 frontend/front/src/assets/index_images/count.png create mode 100644 frontend/front/src/assets/index_images/count_active.png create mode 100644 frontend/front/src/assets/index_images/homePage.png create mode 100644 frontend/front/src/assets/index_images/homePage_active.png create mode 100644 frontend/front/src/assets/index_images/implement.png create mode 100644 frontend/front/src/assets/index_images/implement_active.png create mode 100644 frontend/front/src/assets/index_images/index.js create mode 100644 frontend/front/src/assets/index_images/matter_.png create mode 100644 frontend/front/src/assets/index_images/matter__active.png create mode 100644 frontend/front/src/assets/index_images/meeting.png create mode 100644 frontend/front/src/assets/index_images/meeting_active.png create mode 100644 frontend/front/src/assets/index_images/report.png create mode 100644 frontend/front/src/assets/index_images/report_active.png create mode 100644 frontend/front/src/assets/index_images/rule.png create mode 100644 frontend/front/src/assets/index_images/rule_active.png create mode 100644 frontend/front/src/assets/index_images/setup.png create mode 100644 frontend/front/src/assets/index_images/setup_active.png create mode 100644 frontend/front/src/assets/index_images/side_bg.png create mode 100644 frontend/front/src/assets/login_images/login_logo.png create mode 100644 frontend/front/src/components/amisContainer/AMISRenderer.vue create mode 100644 frontend/front/src/components/amisContainer/index.vue create mode 100644 frontend/front/src/styles/custom.css create mode 100644 frontend/front/src/styles/flex.scss diff --git a/frontend/front/amis.copy.js b/frontend/front/amis.copy.js new file mode 100644 index 0000000..be030c4 --- /dev/null +++ b/frontend/front/amis.copy.js @@ -0,0 +1,23 @@ +const CopyWebpackPlugin = require('copy-webpack-plugin') +const path = require('path') + +const files = [ + 'sdk.js', + 'helper.css', + 'sdk.css', + 'iconfont.css', + 'iconfont.eot', + 'iconfont.woff', + 'iconfont.svg', + 'charts.js' +] + +const CopyAMISAssets = new CopyWebpackPlugin( + files.map((file) => { + return { + from: path.resolve(__dirname, 'node_modules', 'amis', 'sdk', file), + to: `./static/amis/${file}`, + } + }) +) +module.exports = CopyAMISAssets diff --git a/frontend/front/jsconfig.json b/frontend/front/jsconfig.json new file mode 100644 index 0000000..adc4845 --- /dev/null +++ b/frontend/front/jsconfig.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": "./", + "paths": { + "@/*": ["src/*"] + } + }, + "exclude": ["node_modules", "dist"] +} diff --git a/frontend/front/src/api/amis.js b/frontend/front/src/api/amis.js new file mode 100644 index 0000000..0dc1b0a --- /dev/null +++ b/frontend/front/src/api/amis.js @@ -0,0 +1,78 @@ +import request from '@/utils/request' +const form = window.context.form +import axios from 'axios' +import { isExternal } from '@/utils/validate' +export const getAmisTemplate = function (aliasName) { + const params = { + templateId: '1820646919244943360', + queryFilter: { + pageBean: { page: 1, pageSize: 20, total: 5 }, + querys: [ + { + property: 't.F_alias', + value: aliasName, + group: 'main', + operation: 'EQUAL', + relation: 'AND', + }, + ], + sorter: [], + }, + } + return request({ + url: `${form}/form/dataTemplate/v1/listJson`, + method: 'post', + data: params + }) +} + +export const fetcher = ({ + url, // 接口地址 + method, // 请求方法 get、post、put、delete + data, // 请求数据 + responseType, + config, // 其他配置 + headers, // 请求头 +}) => { + config = config || {} + config.withCredentials = true + responseType && (config.responseType = responseType) + + if (config.cancelExecutor) { + config.cancelToken = new axios.CancelToken(config.cancelExecutor) + } + + config.headers = headers || {} + + if (method !== 'post' && method !== 'put' && method !== 'patch') { + if (data) { + config.params = data + } + + return request({ + url: isExternal(url) ? url : `${form}${url}`, + method, + config, + }) + } else if (data && data instanceof FormData) { + config.headers = config.headers || {} + config.headers['Content-Type'] = 'multipart/form-data' + } else if ( + data && + typeof data !== 'string' && + !(data instanceof Blob) && + !(data instanceof ArrayBuffer) + ) { + data = JSON.stringify(data) + config.headers = config.headers || {} + config.headers['Content-Type'] = 'application/json' + } + return request({ + url: isExternal(url) ? url : `${form}${url}`, // 接口地址 + method, // 请求方法 get、post、put、delete + data, // 请求数据 + responseType, + config, // 其他配置 + headers, // 请求头 + }) +} diff --git a/frontend/front/src/assets/index_images/count.png b/frontend/front/src/assets/index_images/count.png new file mode 100644 index 0000000..88f47d2 Binary files /dev/null and b/frontend/front/src/assets/index_images/count.png differ diff --git a/frontend/front/src/assets/index_images/count_active.png b/frontend/front/src/assets/index_images/count_active.png new file mode 100644 index 0000000..694089c Binary files /dev/null and b/frontend/front/src/assets/index_images/count_active.png differ diff --git a/frontend/front/src/assets/index_images/homePage.png b/frontend/front/src/assets/index_images/homePage.png new file mode 100644 index 0000000..20f04fe Binary files /dev/null and b/frontend/front/src/assets/index_images/homePage.png differ diff --git a/frontend/front/src/assets/index_images/homePage_active.png b/frontend/front/src/assets/index_images/homePage_active.png new file mode 100644 index 0000000..9c924c7 Binary files /dev/null and b/frontend/front/src/assets/index_images/homePage_active.png differ diff --git a/frontend/front/src/assets/index_images/implement.png b/frontend/front/src/assets/index_images/implement.png new file mode 100644 index 0000000..e3b8689 Binary files /dev/null and b/frontend/front/src/assets/index_images/implement.png differ diff --git a/frontend/front/src/assets/index_images/implement_active.png b/frontend/front/src/assets/index_images/implement_active.png new file mode 100644 index 0000000..8fab8d0 Binary files /dev/null and b/frontend/front/src/assets/index_images/implement_active.png differ diff --git a/frontend/front/src/assets/index_images/index.js b/frontend/front/src/assets/index_images/index.js new file mode 100644 index 0000000..d8ab1d3 --- /dev/null +++ b/frontend/front/src/assets/index_images/index.js @@ -0,0 +1,35 @@ +import homePage from './homePage.png' +import homePage_active from './homePage_active.png' +import count from './count.png' +import count_active from './count_active.png' +import implement from './implement.png' +import implement_active from './implement_active.png' +import matter_ from './matter_.png' +import matter__active from './matter__active.png' +import meeting from './meeting.png' +import meeting_active from './meeting_active.png' +import report from './report.png' +import report_active from './report_active.png' +import rule from './rule.png' +import rule_active from './rule_active.png' +import setup from './setup.png' +import setup_active from './setup_active.png' + +export default { + homePage, + homePage_active, + count, + count_active, + implement, + implement_active, + matter_, + matter__active, + meeting, + meeting_active, + report, + report_active, + rule, + rule_active, + setup, + setup_active, +} diff --git a/frontend/front/src/assets/index_images/matter_.png b/frontend/front/src/assets/index_images/matter_.png new file mode 100644 index 0000000..ce98a5e Binary files /dev/null and b/frontend/front/src/assets/index_images/matter_.png differ diff --git a/frontend/front/src/assets/index_images/matter__active.png b/frontend/front/src/assets/index_images/matter__active.png new file mode 100644 index 0000000..ff42ac4 Binary files /dev/null and b/frontend/front/src/assets/index_images/matter__active.png differ diff --git a/frontend/front/src/assets/index_images/meeting.png b/frontend/front/src/assets/index_images/meeting.png new file mode 100644 index 0000000..c1c7170 Binary files /dev/null and b/frontend/front/src/assets/index_images/meeting.png differ diff --git a/frontend/front/src/assets/index_images/meeting_active.png b/frontend/front/src/assets/index_images/meeting_active.png new file mode 100644 index 0000000..d71b2bd Binary files /dev/null and b/frontend/front/src/assets/index_images/meeting_active.png differ diff --git a/frontend/front/src/assets/index_images/report.png b/frontend/front/src/assets/index_images/report.png new file mode 100644 index 0000000..5441a5c Binary files /dev/null and b/frontend/front/src/assets/index_images/report.png differ diff --git a/frontend/front/src/assets/index_images/report_active.png b/frontend/front/src/assets/index_images/report_active.png new file mode 100644 index 0000000..aeed406 Binary files /dev/null and b/frontend/front/src/assets/index_images/report_active.png differ diff --git a/frontend/front/src/assets/index_images/rule.png b/frontend/front/src/assets/index_images/rule.png new file mode 100644 index 0000000..72900f8 Binary files /dev/null and b/frontend/front/src/assets/index_images/rule.png differ diff --git a/frontend/front/src/assets/index_images/rule_active.png b/frontend/front/src/assets/index_images/rule_active.png new file mode 100644 index 0000000..89e7f2e Binary files /dev/null and b/frontend/front/src/assets/index_images/rule_active.png differ diff --git a/frontend/front/src/assets/index_images/setup.png b/frontend/front/src/assets/index_images/setup.png new file mode 100644 index 0000000..847348f Binary files /dev/null and b/frontend/front/src/assets/index_images/setup.png differ diff --git a/frontend/front/src/assets/index_images/setup_active.png b/frontend/front/src/assets/index_images/setup_active.png new file mode 100644 index 0000000..14dfc08 Binary files /dev/null and b/frontend/front/src/assets/index_images/setup_active.png differ diff --git a/frontend/front/src/assets/index_images/side_bg.png b/frontend/front/src/assets/index_images/side_bg.png new file mode 100644 index 0000000..1bcdd96 Binary files /dev/null and b/frontend/front/src/assets/index_images/side_bg.png differ diff --git a/frontend/front/src/assets/login_images/login_logo.png b/frontend/front/src/assets/login_images/login_logo.png new file mode 100644 index 0000000..5c62de4 Binary files /dev/null and b/frontend/front/src/assets/login_images/login_logo.png differ diff --git a/frontend/front/src/components/amisContainer/AMISRenderer.vue b/frontend/front/src/components/amisContainer/AMISRenderer.vue new file mode 100644 index 0000000..974e597 --- /dev/null +++ b/frontend/front/src/components/amisContainer/AMISRenderer.vue @@ -0,0 +1,150 @@ + + + diff --git a/frontend/front/src/components/amisContainer/index.vue b/frontend/front/src/components/amisContainer/index.vue new file mode 100644 index 0000000..bdbe2b7 --- /dev/null +++ b/frontend/front/src/components/amisContainer/index.vue @@ -0,0 +1,86 @@ + + diff --git a/frontend/front/src/components/layouts/HtTabsBar/index.vue b/frontend/front/src/components/layouts/HtTabsBar/index.vue index db0c174..9e571f1 100644 --- a/frontend/front/src/components/layouts/HtTabsBar/index.vue +++ b/frontend/front/src/components/layouts/HtTabsBar/index.vue @@ -26,22 +26,28 @@ :closable="!isAffix(item)" > - - -
- +
+ - 添加栏目 - - - 获取最新门户 + 添加订单
+ + + + + + + + + + + + + + +
    import('@/components/layouts'), + // redirect: 'index', + children: [ + { + path: '/addOrder', + name: 'addOrder', + component: () => import('@/views/pages/newOrder/index'), + hidden: true, + meta: { title: '新增订单' }, + }, + ], + }, ] const router = new VueRouter({ diff --git a/frontend/front/src/styles/custom.css b/frontend/front/src/styles/custom.css new file mode 100644 index 0000000..7cb6d7c --- /dev/null +++ b/frontend/front/src/styles/custom.css @@ -0,0 +1,17 @@ +.overflow-one-lines { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.overflow-two-lines { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; +} + +.amis-container .is-required:before{ + display: none; +} \ No newline at end of file diff --git a/frontend/front/src/styles/flex.scss b/frontend/front/src/styles/flex.scss new file mode 100644 index 0000000..fbf5243 --- /dev/null +++ b/frontend/front/src/styles/flex.scss @@ -0,0 +1,130 @@ +// 快捷margin和padding + +// 方向列表 +$directions: top, right, bottom, left; + +// 数值范围（从1到100） +@for $i from 0 through 100 { + @each $direction in $directions { + + // 生成 margin 类 + .margin-#{$direction}-#{$i} { + margin-#{$direction}: #{$i}px; + } + + // 生成 padding 类 + .padding-#{$direction}-#{$i} { + padding-#{$direction}: #{$i}px; + } + } + + // 生成所有方向的 margin 类 + .margin-#{$i} { + margin: #{$i}px; + } + + // 生成所有方向的 padding 类 + .padding-#{$i} { + padding: #{$i}px; + } +} + + +// 使用Sass的循环生成动态的CSS类 +@for $i from 1 through 100 { + .w#{$i} { + width: $i * 1%; // 使用 $i 乘以 1% 来设置宽度 + } +} + +@for $i from 1 through 100 { + .h#{$i} { + height: $i * 1%; // 使用 $i 乘以 1% 来设置高度 + } +} + + +@for $i from 1 through 100 { + .fs#{$i} { + font-size: #{$i}px; + } +} + + + +// 主轴方向 属性值 +$directionList: row, row-reverse, column, column-reverse; +// 主轴对齐方式 属性值 +$justifyContentList: flex-start, flex-end, center, space-between, space-around; +// 交叉轴对齐方式 属性值 +$alignItemsList: flex-start, flex-end, center, baseline, stretch; + +// 三层遍历，组合所有属性值 +@each $direction in $directionList { + + // 简化一些属性值 + $dir: $direction; + + @if $direction =='row' { + $dir: 'x'; + } + + @if $direction =='column' { + $dir: 'y'; + } + + @each $justifyContent in $justifyContentList { + + // 简化一些属性值 + $JC: $justifyContent; + + @if $justifyContent =='flex-start' { + $JC: 'start'; + } + + @if $justifyContent =='flex-end' { + $JC: 'end'; + } + + @if $justifyContent =='space-between' { + $JC: 'between'; + } + + @if $justifyContent =='space-around' { + $JC: 'around'; + } + + @each $alignItems in $alignItemsList { + + // 简化一些属性值 + $AI: $alignItems; + + @if $alignItems =='flex-start' { + $AI: 'start'; + } + + @if $alignItems =='flex-end' { + $AI: 'end'; + } + + // 根据变量，组合为css代码 + @if $AI =='center' { + .flex-#{$dir}-#{$JC} { + display: flex; + flex-direction: $direction; + justify-content: $justifyContent; + align-items: center; + } + } + + @else { + .flex-#{$dir}-#{$JC}-#{$AI} { + display: flex; + flex-direction: $direction; + justify-content: $justifyContent; + align-items: $alignItems; + } + } + } + } +} \ No newline at end of file -- libgit2 0.21.2