优化

icssoa · icssoa · commit bd0e8048672e · 2022-08-17T00:59:56.000+08:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -60,6 +60,7 @@ module.exports = {
 		"vue/singleline-html-element-content-newline": "off",
 		"vue/attribute-hyphenation": "off",
 		"vue/html-self-closing": "off",
-		"vue/require-default-prop": "off"
+		"vue/require-default-prop": "off",
+		"vue/v-on-event-hyphenation": "off"
 	}
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "front-next",
-	"version": "5.8.0",
+	"version": "5.8.1",
 	"scripts": {
 		"dev": "vite --host",
 		"build": "vite build",
@@ -14,6 +14,9 @@
 		"@cool-vue/crud": "^5.4.0",
 		"@element-plus/icons-vue": "^2.0.6",
 		"@vueuse/core": "^9.1.0",
+		"@wangeditor/editor": "^5.1.14",
+		"@wangeditor/editor-for-vue": "^5.1.12",
+		"add": "^2.0.6",
 		"axios": "^0.27.2",
 		"codemirror": "^6.0.1",
 		"core-js": "^3.23.5",
@@ -33,7 +36,8 @@
 		"vue-echarts": "^6.2.3",
 		"vue-router": "^4.1.2",
 		"vuedraggable": "^4.1.0",
-		"xlsx": "^0.18.5"
+		"xlsx": "^0.18.5",
+		"yarn": "^1.22.19"
 	},
 	"devDependencies": {
 		"@types/lodash-es": "^4.17.6",
diff --git a/src/modules/base/pages/login/index.vue b/src/modules/base/pages/login/index.vue
@@ -64,7 +64,7 @@ import { useBase } from "/$/base";
 import Captcha from "./components/captcha.vue";
 
 const { refs, setRefs, router, service } = useCool();
-const { user, menu, app } = useBase();
+const { user, app } = useBase();
 
 // 状态1
 const saving = ref(false);
diff --git a/src/modules/base/views/components/dept/check.vue b/src/modules/base/views/components/dept/check.vue
@@ -42,7 +42,7 @@ const emit = defineEmits(["update:modelValue"]);
 const { service } = useCool();
 
 // el-tree
-const Tree = ref<any>();
+const Tree = ref();
 
 // 树形列表
 const list = ref<any[]>([]);
diff --git a/src/modules/base/views/components/menu/check.vue b/src/modules/base/views/components/menu/check.vue
@@ -44,10 +44,10 @@ const list = ref<any[]>([]);
 const checked = ref<any[]>([]);
 
 // 搜索关键字
-const keyword = ref<string>("");
+const keyword = ref("");
 
 // el-tree 组件
-const Tree = ref<any>();
+const Tree = ref();
 
 // 刷新列表
 function refresh() {
diff --git a/src/modules/base/views/param.vue b/src/modules/base/views/param.vue
@@ -56,7 +56,7 @@ const tab = reactive<any>({
 		{
 			label: "切换代码编辑器",
 			to: 0,
-			component: "cl-editor-quill"
+			component: "cl-editor-wang"
 		}
 	]
 });
@@ -97,7 +97,8 @@ const Table = useTable({
 		},
 		{
 			label: "操作",
-			type: "op"
+			type: "op",
+			buttons: ["edit", "delete"]
 		}
 	]
 });
diff --git a/src/modules/base/views/role.vue b/src/modules/base/views/role.vue
@@ -157,13 +157,14 @@ const Table = useTable({
 		},
 		{
 			label: "操作",
-			type: "op"
+			type: "op",
+			buttons: ["edit", "delete"]
 		}
 	]
 });
 
 // 是否关联上下级
-function onRelevanceChange(val: number) {
+function onRelevanceChange(val: number | string | boolean) {
 	Upsert.value?.setProps("departmentIdList", {
 		checkStrictly: val == 0
 	});
diff --git a/src/modules/chat/components/message.vue b/src/modules/chat/components/message.vue
@@ -67,7 +67,7 @@
 				<ul>
 					<li>
 						<cl-upload @success="onImageSend" :show-file-list="false">
-							<el-icon><Picture /></el-icon>
+							<el-icon><picture /></el-icon>
 						</cl-upload>
 					</li>
 				</ul>
diff --git a/src/modules/demo/views/editor-quill.vue b/src/modules/demo/views/editor-quill.vue
@@ -1,10 +1,32 @@
 <template>
-	<div class="demo">
-		<cl-editor-quill v-model="content" :height="400" />
+	<div class="editor scroller1">
+		<div class="item">
+			<p class="title">Wang</p>
+			<cl-editor-wang v-model="w" height="400px" />
+		</div>
+
+		<div class="item">
+			<p class="title">Quill</p>
+			<cl-editor-quill v-model="q" height="400px" />
+		</div>
 	</div>
 </template>
 
 <script lang="ts" setup name="editor-quill">
 import { ref } from "vue";
-const content = ref<string>("");
+const q = ref("Quill");
+const w = ref("Wang");
 </script>
+
+<style lang="scss" scoped>
+.editor {
+	.title {
+		font-size: 15px;
+		margin-bottom: 10px;
+	}
+
+	.item {
+		margin-bottom: 20px;
+	}
+}
+</style>
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ module.exports = {`
`60`	`60`	`"vue/singleline-html-element-content-newline": "off",`
`61`	`61`	`"vue/attribute-hyphenation": "off",`
`62`	`62`	`"vue/html-self-closing": "off",`
`63`		`- "vue/require-default-prop": "off"`
	`63`	`+ "vue/require-default-prop": "off",`
	`64`	`+ "vue/v-on-event-hyphenation": "off"`
`64`	`65`	`}`
`65`	`66`	`};`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ const tab = reactive<any>({`
`56`	`56`	`{`
`57`	`57`	`label: "切换代码编辑器",`
`58`	`58`	`to: 0,`
`59`		`- component: "cl-editor-quill"`
	`59`	`+ component: "cl-editor-wang"`
`60`	`60`	`}`
`61`	`61`	`]`
`62`	`62`	`});`
`@@ -97,7 +97,8 @@ const Table = useTable({`
`97`	`97`	`},`
`98`	`98`	`{`
`99`	`99`	`label: "操作",`
`100`		`- type: "op"`
	`100`	`+ type: "op",`
	`101`	`+ buttons: ["edit", "delete"]`
`101`	`102`	`}`
`102`	`103`	`]`
`103`	`104`	`});`
Original file line number	Diff line number	Diff line change
`@@ -157,13 +157,14 @@ const Table = useTable({`
`157`	`157`	`},`
`158`	`158`	`{`
`159`	`159`	`label: "操作",`
`160`		`- type: "op"`
	`160`	`+ type: "op",`
	`161`	`+ buttons: ["edit", "delete"]`
`161`	`162`	`}`
`162`	`163`	`]`
`163`	`164`	`});`
`164`	`165`
`165`	`166`	`// 是否关联上下级`
`166`		`-function onRelevanceChange(val: number) {`
	`167`	`+function onRelevanceChange(val: number \| string \| boolean) {`
`167`	`168`	`Upsert.value?.setProps("departmentIdList", {`
`168`	`169`	`checkStrictly: val == 0`
`169`	`170`	`});`