This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/iotdb-web-workbench.git
commit 42a5b2a85b854c5e870bf17c0f86e9c2902b70d1 Author: huangrui <[email protected]> AuthorDate: Tue Sep 14 17:59:02 2021 +0800 fix(css)fix run lint-css error --- frontend/.eslintrc.js | 2 +- frontend/.prettierrc.js | 2 +- frontend/.stylelintrc.js | 11 ++- frontend/babel.config.js | 2 +- frontend/public/iconfont.js | 19 +++++ frontend/public/index.html | 34 ++++---- frontend/src/App.vue | 36 ++++---- frontend/src/components/Echarts.vue | 34 ++++---- frontend/src/components/FormTable.vue | 34 ++++---- frontend/src/components/HelloWorld.vue | 34 ++++---- frontend/src/components/StandTable.vue | 38 ++++----- frontend/src/directive/icon.js | 2 +- frontend/src/directive/index.js | 2 +- frontend/src/i18n/cn.js | 2 +- frontend/src/i18n/de.js | 2 +- frontend/src/i18n/en.js | 2 +- frontend/src/i18n/index.js | 2 +- frontend/src/main.js | 2 +- frontend/src/router/index.js | 2 +- frontend/src/shims-vue.d.ts | 19 +++++ frontend/src/store/dataBaseM/index.js | 2 +- frontend/src/store/index.js | 19 +++++ frontend/src/store/moduleA/index.js | 2 +- frontend/src/store/storage/index.js | 2 +- frontend/src/styles/element.scss | 16 ++-- frontend/src/styles/reset.scss | 17 ++-- frontend/src/styles/variables.scss | 4 +- frontend/src/util/api_axios.js | 2 +- frontend/src/util/axios.js | 2 +- frontend/src/views/About/index.vue | 40 ++++----- .../views/DataBaseM/components/dataListTree.vue | 36 ++++---- .../src/views/DataBaseM/components/iconTypes.vue | 34 ++++---- .../src/views/DataBaseM/hooks/useElementResize.js | 2 +- frontend/src/views/DataBaseM/index.vue | 34 ++++---- frontend/src/views/Device/api/index.js | 2 +- frontend/src/views/Device/index.vue | 38 ++++----- frontend/src/views/DeviceMessage/api/index.js | 2 +- .../src/views/DeviceMessage/components/action.vue | 34 ++++---- frontend/src/views/DeviceMessage/index.vue | 40 ++++----- frontend/src/views/Home.vue | 34 ++++---- frontend/src/views/Login/index.vue | 34 ++++---- frontend/src/views/Root/hooks/useLangSwitch.js | 2 +- frontend/src/views/Root/index.vue | 34 ++++---- frontend/src/views/Source/components/empty.vue | 34 ++++---- frontend/src/views/Source/components/newSource.vue | 35 ++++---- frontend/src/views/Source/index.vue | 98 ++++++++++------------ frontend/src/views/SqlSerch/api/index.js | 2 +- .../src/views/SqlSerch/components/codemirror.vue | 38 ++++----- .../src/views/SqlSerch/components/eltooltip.vue | 36 ++++---- .../src/views/SqlSerch/components/formserch.vue | 36 ++++---- .../views/SqlSerch/components/formserchData.vue | 36 ++++---- .../src/views/SqlSerch/components/sqlDrawer.vue | 34 ++++---- frontend/src/views/SqlSerch/hooks/codemirror.js | 2 +- frontend/src/views/SqlSerch/hooks/function.js | 2 +- frontend/src/views/SqlSerch/hooks/keywords.js | 2 +- frontend/src/views/SqlSerch/hooks/selectList.js | 2 +- .../src/views/SqlSerch/hooks/useElementResize.js | 2 +- frontend/src/views/SqlSerch/index.vue | 46 +++++----- frontend/src/views/storage/index.vue | 36 ++++---- frontend/src/views/storage/newStorage.vue | 36 ++++---- frontend/tests/unit/example.spec.js | 19 +++++ frontend/vue.config.js | 2 +- 62 files changed, 641 insertions(+), 570 deletions(-) diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index 6dee65b..7a37c58 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/.prettierrc.js b/frontend/.prettierrc.js index 39027d1..b5e0015 100644 --- a/frontend/.prettierrc.js +++ b/frontend/.prettierrc.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/.stylelintrc.js b/frontend/.stylelintrc.js index fc0b58d..19a618d 100644 --- a/frontend/.stylelintrc.js +++ b/frontend/.stylelintrc.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -19,5 +19,12 @@ module.exports = { extends: ['stylelint-config-standard-scss', 'stylelint-config-prettier'], - rules: {}, + rules: { + 'selector-pseudo-class-no-unknown': [ + true, + { + ignorePseudoClasses: ['deep'], + }, + ], + }, }; diff --git a/frontend/babel.config.js b/frontend/babel.config.js index 742f9ca..399e97a 100644 --- a/frontend/babel.config.js +++ b/frontend/babel.config.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/public/iconfont.js b/frontend/public/iconfont.js index d8c0b2d..b628be0 100644 --- a/frontend/public/iconfont.js +++ b/frontend/public/iconfont.js @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + !(function (a) { var l, h, diff --git a/frontend/public/index.html b/frontend/public/index.html index bfb0338..1dc756a 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> <!DOCTYPE html> <html lang=""> diff --git a/frontend/src/App.vue b/frontend/src/App.vue index a5ba243..0e6121c 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <router-view /> @@ -25,7 +25,7 @@ #app { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - color: #222222; + color: #222; font-family: PingFang SC, Arial, sans-serif; text-align: center; height: 100vh; diff --git a/frontend/src/components/Echarts.vue b/frontend/src/components/Echarts.vue index f9855b6..9f3b65c 100644 --- a/frontend/src/components/Echarts.vue +++ b/frontend/src/components/Echarts.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div id="myChart" class="echartsBox"></div> diff --git a/frontend/src/components/FormTable.vue b/frontend/src/components/FormTable.vue index efd8c44..790f4ca 100644 --- a/frontend/src/components/FormTable.vue +++ b/frontend/src/components/FormTable.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <el-form :model="formData" :rules="rules" :inline="inline" :label-position="labelPosition" :class="(inline ? 'demo-form-inline' : '', 'form_style')"> diff --git a/frontend/src/components/HelloWorld.vue b/frontend/src/components/HelloWorld.vue index 197a6f1..23e479a 100644 --- a/frontend/src/components/HelloWorld.vue +++ b/frontend/src/components/HelloWorld.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="hello">欢迎加入IoTDB前端开发</div> diff --git a/frontend/src/components/StandTable.vue b/frontend/src/components/StandTable.vue index 479d3ef..940be68 100644 --- a/frontend/src/components/StandTable.vue +++ b/frontend/src/components/StandTable.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div> @@ -220,13 +220,13 @@ export default { justify-content: space-between; padding: 10px 30px; .el-pagination { - padding: 4px 5px 0px 5px; + padding: 4px 5px 0 5px; } } .export_button { height: 30px; line-height: 0px; - min-height: 0px !important; + min-height: 0 !important; } </style> <style lang="scss"> diff --git a/frontend/src/directive/icon.js b/frontend/src/directive/icon.js index ab5fcd2..1521e2b 100644 --- a/frontend/src/directive/icon.js +++ b/frontend/src/directive/icon.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/directive/index.js b/frontend/src/directive/index.js index 4464bed..e6b8bcf 100644 --- a/frontend/src/directive/index.js +++ b/frontend/src/directive/index.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/i18n/cn.js b/frontend/src/i18n/cn.js index 5f39d31..22e1279 100644 --- a/frontend/src/i18n/cn.js +++ b/frontend/src/i18n/cn.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/i18n/de.js b/frontend/src/i18n/de.js index 83e16b5..16d7473 100644 --- a/frontend/src/i18n/de.js +++ b/frontend/src/i18n/de.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/i18n/en.js b/frontend/src/i18n/en.js index 9ff584f..d557bd9 100644 --- a/frontend/src/i18n/en.js +++ b/frontend/src/i18n/en.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/i18n/index.js b/frontend/src/i18n/index.js index 6a09651..5a55432 100644 --- a/frontend/src/i18n/index.js +++ b/frontend/src/i18n/index.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/main.js b/frontend/src/main.js index 4f5b46e..85c2b05 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index afa0ff9..9280615 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/shims-vue.d.ts b/frontend/src/shims-vue.d.ts index 1c8caa6..69648d8 100644 --- a/frontend/src/shims-vue.d.ts +++ b/frontend/src/shims-vue.d.ts @@ -1 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + declare module 'codemirror' \ No newline at end of file diff --git a/frontend/src/store/dataBaseM/index.js b/frontend/src/store/dataBaseM/index.js index fb5b3c2..96940a7 100644 --- a/frontend/src/store/dataBaseM/index.js +++ b/frontend/src/store/dataBaseM/index.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index 57ae3bf..70697d4 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import { createStore } from 'vuex'; import moduleA from './moduleA'; import axios from '@/util/axios.js'; diff --git a/frontend/src/store/moduleA/index.js b/frontend/src/store/moduleA/index.js index 6c83b0b..0eac2a0 100644 --- a/frontend/src/store/moduleA/index.js +++ b/frontend/src/store/moduleA/index.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/store/storage/index.js b/frontend/src/store/storage/index.js index 316ac3c..cf5ec21 100644 --- a/frontend/src/store/storage/index.js +++ b/frontend/src/store/storage/index.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss index 893ee8e..44c3229 100644 --- a/frontend/src/styles/element.scss +++ b/frontend/src/styles/element.scss @@ -1,4 +1,4 @@ -/* +/*! * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -40,6 +40,11 @@ } } .el-tree--highlight-current .el-tree-node { + .el-tree-node__content { + border-style: solid; + border-color: transparent; + border-width: 10px 16px; + } &.is-current { & > .el-tree-node__content { border-style: solid; @@ -59,11 +64,6 @@ } } } - .el-tree-node__content { - border-style: solid; - border-color: transparent; - border-width: 10px 16px; - } } .el-dialog { margin: 0 auto; @@ -104,7 +104,7 @@ font-size: 12px !important; } .el-table th { - color: #222222 !important; + color: #222 !important; } .el-input__icon { diff --git a/frontend/src/styles/reset.scss b/frontend/src/styles/reset.scss index 1b34ca9..dd282b0 100644 --- a/frontend/src/styles/reset.scss +++ b/frontend/src/styles/reset.scss @@ -1,4 +1,4 @@ -/* +/*! * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -102,7 +102,10 @@ video { padding: 0; border: 0; font-size: 100%; - font: inherit; + font-weight: inherit; + font-variant: inherit; + font-style: inherit; + font-family: inherit; vertical-align: baseline; } // HTML5 display-role reset for older browsers @@ -130,10 +133,10 @@ blockquote, q { quotes: none; } -blockquote:before, -blockquote:after, -q:before, -q:after { +blockquote::before, +blockquote::after, +q::before, +q::after { content: ''; content: none; } diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss index 8396746..8a2ad81 100644 --- a/frontend/src/styles/variables.scss +++ b/frontend/src/styles/variables.scss @@ -1,4 +1,4 @@ -/* +/*! * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/util/api_axios.js b/frontend/src/util/api_axios.js index a3c2a57..0110590 100644 --- a/frontend/src/util/api_axios.js +++ b/frontend/src/util/api_axios.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/util/axios.js b/frontend/src/util/axios.js index 4d88491..ee22353 100644 --- a/frontend/src/util/axios.js +++ b/frontend/src/util/axios.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/About/index.vue b/frontend/src/views/About/index.vue index 44039a2..ff64a97 100644 --- a/frontend/src/views/About/index.vue +++ b/frontend/src/views/About/index.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="about"> @@ -159,7 +159,7 @@ export default { font-size: 30px; font-weight: 500; line-height: 38px; - color: #222222; + color: #222; margin-bottom: 30px; } .line-4, @@ -167,7 +167,7 @@ export default { font-size: 14px; font-weight: 400; line-height: 22px; - color: #222222; + color: #222; margin-bottom: 20px; } .line-6 { @@ -190,7 +190,7 @@ export default { .line-7 { font-size: 14px; line-height: 22px; - color: #222222; + color: #222; } } .right { diff --git a/frontend/src/views/DataBaseM/components/dataListTree.vue b/frontend/src/views/DataBaseM/components/dataListTree.vue index 5d2bced..40769b2 100644 --- a/frontend/src/views/DataBaseM/components/dataListTree.vue +++ b/frontend/src/views/DataBaseM/components/dataListTree.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="data-list-tree"> @@ -376,7 +376,7 @@ export default { } .icon-1 { top: 2px; - right: 0px; + right: 0; position: absolute; } .icon-2 { diff --git a/frontend/src/views/DataBaseM/components/iconTypes.vue b/frontend/src/views/DataBaseM/components/iconTypes.vue index 3922abd..7fce25a 100644 --- a/frontend/src/views/DataBaseM/components/iconTypes.vue +++ b/frontend/src/views/DataBaseM/components/iconTypes.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <span class="iconTypes"> diff --git a/frontend/src/views/DataBaseM/hooks/useElementResize.js b/frontend/src/views/DataBaseM/hooks/useElementResize.js index 24db48e..389a352 100644 --- a/frontend/src/views/DataBaseM/hooks/useElementResize.js +++ b/frontend/src/views/DataBaseM/hooks/useElementResize.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/DataBaseM/index.vue b/frontend/src/views/DataBaseM/index.vue index 8749b2c..9a39edf 100644 --- a/frontend/src/views/DataBaseM/index.vue +++ b/frontend/src/views/DataBaseM/index.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="databasem"> diff --git a/frontend/src/views/Device/api/index.js b/frontend/src/views/Device/api/index.js index c3047d0..c1431a1 100644 --- a/frontend/src/views/Device/api/index.js +++ b/frontend/src/views/Device/api/index.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/Device/index.vue b/frontend/src/views/Device/index.vue index 0a96df4..e6c0ec3 100644 --- a/frontend/src/views/Device/index.vue +++ b/frontend/src/views/Device/index.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div style="padding: 20px"> @@ -428,7 +428,7 @@ export default { color: #606266; } .addbutton { - color: #ffffff; + color: #fff; margin-left: 20px; padding: 10px 30px; background-color: $theme-color; @@ -448,7 +448,7 @@ export default { } .footer { position: absolute; - bottom: 0px; + bottom: 0; left: 50%; background: #fff; height: 52px; diff --git a/frontend/src/views/DeviceMessage/api/index.js b/frontend/src/views/DeviceMessage/api/index.js index 063f2b0..44a9aa7 100644 --- a/frontend/src/views/DeviceMessage/api/index.js +++ b/frontend/src/views/DeviceMessage/api/index.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/DeviceMessage/components/action.vue b/frontend/src/views/DeviceMessage/components/action.vue index d31db76..093d89b 100644 --- a/frontend/src/views/DeviceMessage/components/action.vue +++ b/frontend/src/views/DeviceMessage/components/action.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div :id="id" class="echartsBox"></div> diff --git a/frontend/src/views/DeviceMessage/index.vue b/frontend/src/views/DeviceMessage/index.vue index 8ea44c6..eaaf9ae 100644 --- a/frontend/src/views/DeviceMessage/index.vue +++ b/frontend/src/views/DeviceMessage/index.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div> @@ -346,7 +346,7 @@ $cursor: pointer; } .drawer { // width: 84%; - bottom: 0px; + bottom: 0; background: #fff; position: absolute; z-index: 9; @@ -388,9 +388,9 @@ $cursor: pointer; font-size: 14px; } .creatButton { - padding: 0px 40px; + padding: 0 40px; height: 35px; - min-height: 0px !important; + min-height: 0 !important; background: #409eff; color: #fff; margin-top: 3px; diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue index 8305887..4c1f608 100644 --- a/frontend/src/views/Home.vue +++ b/frontend/src/views/Home.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="home"> diff --git a/frontend/src/views/Login/index.vue b/frontend/src/views/Login/index.vue index 174019e..0e7a246 100644 --- a/frontend/src/views/Login/index.vue +++ b/frontend/src/views/Login/index.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="login"> diff --git a/frontend/src/views/Root/hooks/useLangSwitch.js b/frontend/src/views/Root/hooks/useLangSwitch.js index 14dda60..b72338e 100644 --- a/frontend/src/views/Root/hooks/useLangSwitch.js +++ b/frontend/src/views/Root/hooks/useLangSwitch.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/Root/index.vue b/frontend/src/views/Root/index.vue index 5becb33..06d4934 100644 --- a/frontend/src/views/Root/index.vue +++ b/frontend/src/views/Root/index.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="root"> diff --git a/frontend/src/views/Source/components/empty.vue b/frontend/src/views/Source/components/empty.vue index cb7a0f2..8ca2ee5 100644 --- a/frontend/src/views/Source/components/empty.vue +++ b/frontend/src/views/Source/components/empty.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="empty-page"> diff --git a/frontend/src/views/Source/components/newSource.vue b/frontend/src/views/Source/components/newSource.vue index 1096971..9d65f59 100644 --- a/frontend/src/views/Source/components/newSource.vue +++ b/frontend/src/views/Source/components/newSource.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="new-source"> @@ -295,7 +295,6 @@ export default { .source-form { .eg { font-size: 12px; - color: rgba(34, 34, 34, 0.4); } } diff --git a/frontend/src/views/Source/index.vue b/frontend/src/views/Source/index.vue index 237fd7c..79bd136 100644 --- a/frontend/src/views/Source/index.vue +++ b/frontend/src/views/Source/index.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="source-detail-container"> @@ -1162,30 +1162,30 @@ export default { } .icon-del { position: absolute; - top: 0px; + top: 0; right: 40px; color: #d32d2fff; } .del-user { right: 0; } + .icon { + cursor: pointer; + } .info-box { padding: 10px 20px 14px; position: relative; + font-size: 16px; + font-weight: 500; + color: #222; .icon { position: absolute; top: 19px; } - .icon-edit { right: 60px; color: $theme-color; } - } - .info-box { - font-size: 16px; - font-weight: 500; - color: #222222; .title { margin: 10px 0 20px; } @@ -1197,10 +1197,19 @@ export default { } } } - .icon { - cursor: pointer; + .info-head { + height: 40px; + line-height: 40px; + background: #f6f6f8; + font-size: 14px; + color: #222; + padding-left: 20px; + .icon { + font-size: 16px; + cursor: pointer; + margin-right: 4px; + } } - .permission-box { .permit-content { display: flex; @@ -1213,15 +1222,10 @@ export default { height: 17px; font-size: 12px; font-weight: 400; - line-height: 20px; - font-size: 12px; - color: #d32d2fff; line-height: 16px; margin-left: 10px; - padding: 3px 8px; color: rgba(34, 34, 34, 0.65); padding: 0 8px 10px 16px; - button { float: right; font-size: 12px; @@ -1262,16 +1266,12 @@ export default { .right-part { flex: 1; position: relative; - &:deep(.el-input__suffix .el-input__icon) { - line-height: 42px !important; - } .auth-add-btn { position: absolute; right: 10px; top: 6px; z-index: 1000; } - .tabs { position: relative; } @@ -1289,10 +1289,6 @@ export default { display: none; } } - &:deep(.el-checkbox__input.is-disabled + span.el-checkbox__label) { - color: #222222; - cursor: default; - } &:deep(.el-checkbox__label) { font-size: 12px !important; font-weight: 400; @@ -1300,6 +1296,13 @@ export default { &:deep(.el-input .el-input__inner) { font-size: 12px !important; } + &:deep(.el-input__suffix .el-input__icon) { + line-height: 42px !important; + } + &:deep(.el-checkbox__input.is-disabled + span.el-checkbox__label) { + color: #222; + cursor: default; + } .el-select { width: 100%; } @@ -1313,7 +1316,6 @@ export default { font-size: 12px; color: #d32d2fff; line-height: 16px; - margin-left: 10px; background: rgba(211, 45, 47, 0.04); padding: 3px 8px; margin: 16px 18px 16px 14px; @@ -1330,7 +1332,6 @@ export default { } .user-name { max-width: calc(100% - 50px); - overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -1359,19 +1360,6 @@ export default { } } } - .info-head { - height: 40px; - line-height: 40px; - background: #f6f6f8; - font-size: 14px; - color: #222222; - padding-left: 20px; - .icon { - font-size: 16px; - cursor: pointer; - margin-right: 4px; - } - } .storage-box { .group-table { width: 100%; diff --git a/frontend/src/views/SqlSerch/api/index.js b/frontend/src/views/SqlSerch/api/index.js index 926405f..9ff6fb6 100644 --- a/frontend/src/views/SqlSerch/api/index.js +++ b/frontend/src/views/SqlSerch/api/index.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/SqlSerch/components/codemirror.vue b/frontend/src/views/SqlSerch/components/codemirror.vue index a933303..153ac1f 100644 --- a/frontend/src/views/SqlSerch/components/codemirror.vue +++ b/frontend/src/views/SqlSerch/components/codemirror.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="font_fmiy"> @@ -148,7 +148,7 @@ export default { </script> <style lang="scss"> .CodeMirror-linenumber { - padding: 5px 3px 5px 0px !important; + padding: 5px 3px 5px 0 !important; } pre.CodeMirror-line { padding: 5px 20px !important; @@ -164,7 +164,7 @@ pre.CodeMirror-line { .font_fmiy { .CodeMirror-line { font-size: 11px !important; - font-family: 'PingFang SC, Arial, sans-serif' !important; + font-family: PingFang SC, Arial, sans-serif !important; } } </style> diff --git a/frontend/src/views/SqlSerch/components/eltooltip.vue b/frontend/src/views/SqlSerch/components/eltooltip.vue index 83e5d2a..462bde7 100644 --- a/frontend/src/views/SqlSerch/components/eltooltip.vue +++ b/frontend/src/views/SqlSerch/components/eltooltip.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <el-tooltip class="item" effect="light" :content="$t(label)" placement="top"> @@ -35,5 +35,3 @@ export default { }, }; </script> - -<style></style> diff --git a/frontend/src/views/SqlSerch/components/formserch.vue b/frontend/src/views/SqlSerch/components/formserch.vue index 2ed9972..01a177c 100644 --- a/frontend/src/views/SqlSerch/components/formserch.vue +++ b/frontend/src/views/SqlSerch/components/formserch.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div> @@ -82,7 +82,7 @@ export default { <style lang="scss" scoped> .serch_div { font-size: 14px; - padding: 20px 20px 0px 20px; + padding: 20px 20px 0 20px; background: #fff; &.maxheight { height: 65vh; diff --git a/frontend/src/views/SqlSerch/components/formserchData.vue b/frontend/src/views/SqlSerch/components/formserchData.vue index 0cf2597..a5ba50b 100644 --- a/frontend/src/views/SqlSerch/components/formserchData.vue +++ b/frontend/src/views/SqlSerch/components/formserchData.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div> @@ -178,7 +178,7 @@ export default { font-size: 12px; justify-content: space-between; border-bottom: 1px solid #ebeef5; - padding: 10px 0px; + padding: 10px 0; cursor: pointer; span { flex: 1; diff --git a/frontend/src/views/SqlSerch/components/sqlDrawer.vue b/frontend/src/views/SqlSerch/components/sqlDrawer.vue index bddb6ac..83b8d6c 100644 --- a/frontend/src/views/SqlSerch/components/sqlDrawer.vue +++ b/frontend/src/views/SqlSerch/components/sqlDrawer.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="drawer"> diff --git a/frontend/src/views/SqlSerch/hooks/codemirror.js b/frontend/src/views/SqlSerch/hooks/codemirror.js index 4b88ec5..5619571 100644 --- a/frontend/src/views/SqlSerch/hooks/codemirror.js +++ b/frontend/src/views/SqlSerch/hooks/codemirror.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/SqlSerch/hooks/function.js b/frontend/src/views/SqlSerch/hooks/function.js index 02f567f..00a62e7 100644 --- a/frontend/src/views/SqlSerch/hooks/function.js +++ b/frontend/src/views/SqlSerch/hooks/function.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/SqlSerch/hooks/keywords.js b/frontend/src/views/SqlSerch/hooks/keywords.js index 369b333..1c3767e 100644 --- a/frontend/src/views/SqlSerch/hooks/keywords.js +++ b/frontend/src/views/SqlSerch/hooks/keywords.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/SqlSerch/hooks/selectList.js b/frontend/src/views/SqlSerch/hooks/selectList.js index e293e10..f259bea 100644 --- a/frontend/src/views/SqlSerch/hooks/selectList.js +++ b/frontend/src/views/SqlSerch/hooks/selectList.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/SqlSerch/hooks/useElementResize.js b/frontend/src/views/SqlSerch/hooks/useElementResize.js index d308c19..5e4a2bd 100644 --- a/frontend/src/views/SqlSerch/hooks/useElementResize.js +++ b/frontend/src/views/SqlSerch/hooks/useElementResize.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/frontend/src/views/SqlSerch/index.vue b/frontend/src/views/SqlSerch/index.vue index 8baba7b..60c8252 100644 --- a/frontend/src/views/SqlSerch/index.vue +++ b/frontend/src/views/SqlSerch/index.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <el-container> @@ -423,7 +423,7 @@ export default { .footer { &.el-footer { padding: 0; - height: 0px !important; + height: 0 !important; } .divider { // width: 1px; @@ -438,9 +438,9 @@ export default { .tabs { height: 30px; background: #efefef; - box-shadow: 0px 0px 2px #d2d2d2; + box-shadow: 0 0 2px #d2d2d2; .frist_span { - color: #cccccc; + color: #ccc; font-size: 11px; margin-left: 20px; } @@ -477,12 +477,12 @@ export default { height: 100%; } .tabs_nav .el-tabs__item { - padding: 5px 0px !important; + padding: 5px 0 !important; width: 100px; font-size: 11px !important; } .tabs_nav_aside .el-tabs__item { - padding: 7px 0px !important; + padding: 7px 0 !important; width: 60px; font-size: 11px !important; } @@ -492,7 +492,7 @@ export default { overflow: hidden; line-height: 15px; position: absolute; - top: 0px; + top: 0; &.green { color: #00c300; } diff --git a/frontend/src/views/storage/index.vue b/frontend/src/views/storage/index.vue index da7faec..89a516c 100644 --- a/frontend/src/views/storage/index.vue +++ b/frontend/src/views/storage/index.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="storage-container"> @@ -297,7 +297,7 @@ export default { color: $theme-color; } .icon:last-child { - margin-right: 0px; + margin-right: 0; color: #d32d2fff; } } diff --git a/frontend/src/views/storage/newStorage.vue b/frontend/src/views/storage/newStorage.vue index 6efdc90..1761039 100644 --- a/frontend/src/views/storage/newStorage.vue +++ b/frontend/src/views/storage/newStorage.vue @@ -1,21 +1,21 @@ <!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + --> <template> <div class="new-storage-container"> @@ -246,7 +246,7 @@ export default { position: absolute; width: 100px; top: 46px; - left: 0px; + left: 0; } } diff --git a/frontend/tests/unit/example.spec.js b/frontend/tests/unit/example.spec.js index a3a7340..8eed9c6 100644 --- a/frontend/tests/unit/example.spec.js +++ b/frontend/tests/unit/example.spec.js @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import { expect } from 'chai'; import { shallowMount } from '@vue/test-utils'; import HelloWorld from '@/components/HelloWorld.vue'; diff --git a/frontend/vue.config.js b/frontend/vue.config.js index f038053..9ba20b1 100644 --- a/frontend/vue.config.js +++ b/frontend/vue.config.js @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an
