From 584e81376db847392df0743c8d48e78ed4ccf0d7 Mon Sep 17 00:00:00 2001 From: sc Date: Wed, 2 Jun 2021 09:55:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?filterBar=20=E5=BC=82=E6=AD=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scFilterBar/index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/scFilterBar/index.vue b/src/components/scFilterBar/index.vue index 029fed3e..b5a89e5c 100644 --- a/src/components/scFilterBar/index.vue +++ b/src/components/scFilterBar/index.vue @@ -94,7 +94,11 @@ async remoteMethod(query){ if(query !== ''){ this.selectLoading = true; + try { var data = await this.addFilterForm.field.extend.request(query); + }catch (error) { + console.log(error); + } this.addFilterForm.field.extend.data = data; this.selectLoading = false; }else{ @@ -105,7 +109,11 @@ if(isopen && this.addFilterForm.field.extend && this.addFilterForm.field.extend.request && !this.addFilterForm.field.extend.remote){ //如果字段类型为异步获取数据就在这里处理 this.selectLoading = true; + try { var data = await this.addFilterForm.field.extend.request(); + }catch (error) { + console.log(error); + } this.addFilterForm.field.extend.data = data; this.selectLoading = false; } From e5b26070f5a015cb9c43a0f6f0cda4a368f04909 Mon Sep 17 00:00:00 2001 From: sc Date: Wed, 2 Jun 2021 15:17:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?ADD=20=E7=BB=84=E4=BB=B6scFormTable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scFormTable/index.vue | 67 ++++++++++++++++ src/main.js | 2 + src/views/vab/formtable.vue | 114 +++++++++++++++++++++++++++ 3 files changed, 183 insertions(+) create mode 100644 src/components/scFormTable/index.vue create mode 100644 src/views/vab/formtable.vue diff --git a/src/components/scFormTable/index.vue b/src/components/scFormTable/index.vue new file mode 100644 index 00000000..7cba0684 --- /dev/null +++ b/src/components/scFormTable/index.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/src/main.js b/src/main.js index 2e24f503..ebe158c1 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,7 @@ import scTable from './components/scTable' import scFilterBar from './components/scFilterBar' import scUpload from './components/scUpload' import scUploadMultiple from './components/scUpload/multiple' +import scFormTable from './components/scFormTable' const app = createApp(App); @@ -32,5 +33,6 @@ app.component('scTable', scTable); app.component('scFilterBar', scFilterBar); app.component('scUpload', scUpload); app.component('scUploadMultiple', scUploadMultiple); +app.component('scFormTable', scFormTable); app.mount('#app'); diff --git a/src/views/vab/formtable.vue b/src/views/vab/formtable.vue new file mode 100644 index 00000000..53340fc0 --- /dev/null +++ b/src/views/vab/formtable.vue @@ -0,0 +1,114 @@ + + + From 56c65706604ab55ce4f245fe8aa3311f40bc07e0 Mon Sep 17 00:00:00 2001 From: sc Date: Wed, 2 Jun 2021 16:48:57 +0800 Subject: [PATCH 3/4] Update fix.less --- src/style/fix.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/style/fix.less b/src/style/fix.less index 5e209a9f..7dcf56d9 100644 --- a/src/style/fix.less +++ b/src/style/fix.less @@ -16,4 +16,9 @@ .el-popconfirm__main {margin: 14px 0;} .el-card__header {border-bottom: 0} .el-tree.menu .el-tree-node__content {height:36px;} -.el-input-number__decrease, .el-input-number__increase {top:2px;} \ No newline at end of file +.el-input-number__decrease, .el-input-number__increase {top:2px;} + +/* 覆盖tinymce样式 */ +.sceditor .tox-tinymce {border: 1px solid #DCDFE6;} +.sceditor .tox .tox-statusbar {border-top: 1px solid #DCDFE6;} +.sceditor .tox .tox-toolbar__primary {background: #f6f8f9;border-bottom: 1px solid #DCDFE6;} From f35261cf0a3e4067cd296606d0711560ea3c27e4 Mon Sep 17 00:00:00 2001 From: sc Date: Thu, 3 Jun 2021 10:15:23 +0800 Subject: [PATCH 4/4] Update README.md --- README.md | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a8f96f1f..f53f82a2 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,28 @@ # SCUI +![logo](https://lolicode.gitee.io/scui-doc/logo.png) +## 介绍 +SCUI 是一个中后台前端解决方案，基于VUE3和elementPlus实现。 +使用最新的前端技术栈，提供各类实用的组件方便在业务开发时的调用，并且持续性的提供丰富的业务模板帮助你快速搭建企业级中后台前端任务。 -#### 介绍 -Vue 3.0 + Vue-Router 4.0 + Element-Plus + Axios 后台管理系统。 +SCUI的宗旨是 让一切复杂的东西傻瓜化。 -#### 说明 -有时间再写吧~ +## 演示和文档 +[文档](https://lolicode.gitee.io/scui-doc/) -#### 安装教程 +[演示](https://lolicode.gitee.io/scui-doc/demo/#/login) -1. npm i -2. npm run serve +## 安装教程 +``` sh +# 克隆项目 +git clone https://gitee.com/lolicode/scui.git + +# 进入项目目录 +cd scui + +# 安装依赖 +npm i + +# 启动项目(开发模式) +npm run serve +``` +启动完成后浏览器访问 http://localhost:2800