Merge branch 'dev'

README.md

@@ -1,12 +1,28 @@
 # SCUI
+![logo](https://lolicode.gitee.io/scui-doc/logo.png)
+## 介绍
+SCUI 是一个中后台前端解决方案，基于VUE3和elementPlus实现。
+使用最新的前端技术栈，提供各类实用的组件方便在业务开发时的调用，并且持续性的提供丰富的业务模板帮助你快速搭建企业级中后台前端任务。
 
-#### 介绍
+SCUI的宗旨是 让一切复杂的东西傻瓜化。
-Vue 3.0 + Vue-Router 4.0 + Element-Plus + Axios 后台管理系统。
 
-#### 说明
+## 演示和文档
-有时间再写吧~
+[文档](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

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;
 				}

src/components/scFormTable/index.vue

@@ -0,0 +1,67 @@
+<template>
+	<div class="sc-form-table">
+		<el-table :data="data" border stripe>
+			<el-table-column type="index" width="50" fixed="left">
+				<template #header>
+					<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="rowAdd"></el-button>
+				</template>
+				<template #default="scope">
+					<div class="sc-form-table-handle">
+						<span>{{scope.$index + 1}}</span>
+						<el-button type="danger" icon="el-icon-delete" size="mini" circle @click="rowDel(scope.row, scope.$index)"></el-button>
+					</div>
+				</template>
+			</el-table-column>
+			<slot></slot>
+			<el-table-column min-width="1"></el-table-column>
+			<template #empty>
+				{{placeholder}}
+			</template>
+		</el-table>
+	</div>
+</template>
+
+<script>
+	export default {
+		props: {
+			modelValue: { type: Array, default: () => [] },
+			addTemplate: { type: Object, default: () => {} },
+			placeholder: { type: String, default: "暂无数据" }
+		},
+		data(){
+			return {
+				data: [],
+			}
+		},
+		mounted(){
+			this.data = this.modelValue
+		},
+		watch:{
+			modelValue(){
+				this.data = this.modelValue
+			},
+			data: {
+				handler(){
+					this.$emit('update:modelValue', this.data);
+				},
+				deep: true
+			}
+		},
+		methods: {
+			rowAdd(){
+				this.data.push({...this.addTemplate})
+			},
+			rowDel(row, index){
+				this.data.splice(index, 1)
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.sc-form-table .sc-form-table-handle {text-align: center;}
+	.sc-form-table .sc-form-table-handle span {display: inline-block;}
+	.sc-form-table .sc-form-table-handle button {display: none;}
+	.sc-form-table .hover-row .sc-form-table-handle span {display: none;}
+	.sc-form-table .hover-row .sc-form-table-handle button {display: inline-block;}
+</style>

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');

src/style/fix.less

@@ -17,3 +17,8 @@
 .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;}
+
+/* 覆盖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;}

src/views/vab/formtable.vue

@@ -0,0 +1,114 @@
+<template>
+	<el-main>
+		<el-alert title="来自AVUE的灵感, 业务会有表单里含有对象数组的可能, 进行封装后进行增删改操作, 并且支持联动form表单的禁用属性" type="success" style="margin-bottom:20px;"></el-alert>
+
+		<el-card shadow="never">
+			<el-form ref="ruleForm" :model="form" :rules="rules" label-width="100px">
+				<el-form-item label="标题" prop="title">
+					<el-input v-model="form.title"></el-input>
+				</el-form-item>
+				<el-form-item label="表格" prop="list">
+					<sc-form-table v-model="form.list" :addTemplate="addTemplate" placeholder="暂无数据">
+						<el-table-column prop="time" label="时间" width="180">
+							<template #default="scope">
+								<el-time-select v-model="scope.row.time"></el-time-select>
+							</template>
+						</el-table-column>
+						<el-table-column prop="type" label="类型" width="180">
+							<template #default="scope">
+								<el-select v-model="scope.row.type" placeholder="请选择">
+									<el-option v-for="item in typeDic" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</template>
+						</el-table-column>
+						<el-table-column prop="val" label="数量" width="180">
+							<template #default="scope">
+								<el-input v-model="scope.row.val" placeholder="请输入内容"></el-input>
+							</template>
+						</el-table-column>
+						<el-table-column prop="open" label="checked" width="80" align="center">
+							<template #default="scope">
+								<el-checkbox v-model="scope.row.checked"></el-checkbox>
+							</template>
+						</el-table-column>
+						<el-table-column prop="open" label="开关" width="80" align="center">
+							<template #default="scope">
+								<el-switch v-model="scope.row.open"></el-switch>
+							</template>
+						</el-table-column>
+					</sc-form-table>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="submitForm">保存</el-button>
+				    <el-button @click="resetForm">重置</el-button>
+				</el-form-item>
+			</el-form>
+		</el-card>
+	</el-main>
+</template>
+
+<script>
+	export default {
+		name: 'formtable',
+		data(){
+			return {
+				addTemplate: {
+					time: '',
+					type: '',
+					val: '',
+					open: true,
+					checked: false
+				},
+				form: {
+					title: "标题",
+					list: [
+						{
+							time: '09:00',
+							type: '1',
+							val: '100',
+							open: true,
+							checked: true
+						},
+						{
+							time: '10:00',
+							type: '0',
+							val: '50',
+							open: false,
+							checked: true
+						}
+					]
+				},
+				typeDic: [
+					{
+						label: "全局",
+						value: "0"
+					},
+					{
+						label: "局部",
+						value: "1"
+					}
+				],
+				rules: {
+					title: [
+						{required: true, message: '请上传', trigger: 'blur'}
+					]
+				}
+			}
+		},
+		methods: {
+			submitForm(){
+				this.$refs.ruleForm.validate((valid) => {
+					if (valid) {
+						alert('请看控制台输出');
+						console.log(this.form);
+					}else{
+						return false;
+					}
+				})
+			},
+			resetForm(){
+				this.$refs.ruleForm.resetFields();
+			}
+		}
+	}
+</script>