Skip to content

Commit f4ea403

Browse files
committed
优化细节
1 parent 5890761 commit f4ea403

File tree

6 files changed

+10
-18
lines changed

6 files changed

+10
-18
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cool-admin-vue",
3-
"version": "3.1.4",
3+
"version": "3.1.5",
44
"scripts": {
55
"serve": "vue-cli-service serve",
66
"build": "vue-cli-service build",
@@ -10,9 +10,9 @@
1010
},
1111
"dependencies": {
1212
"axios": "^0.21.1",
13-
"cl-admin": "^1.5.0",
13+
"cl-admin": "^1.5.1",
1414
"cl-admin-crud": "^1.6.4",
15-
"cl-admin-theme": "^0.0.4",
15+
"cl-admin-theme": "^0.0.5",
1616
"clipboard": "^2.0.7",
1717
"codemirror": "^5.59.4",
1818
"core-js": "^3.6.5",

src/cool/modules/base/components/codemirror/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div class="cl-code">
2+
<div class="cl-codemirror">
33
<codemirror
44
ref="code"
55
v-model="value2"
@@ -91,7 +91,7 @@ export default {
9191
</script>
9292

9393
<style lang="scss">
94-
.cl-code {
94+
.cl-codemirror {
9595
border-radius: 3px;
9696
border: 1px solid #dcdfe6;
9797
box-sizing: border-box;

src/cool/modules/base/views/user.vue

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
ref="upsert"
9292
:items="upsert.items"
9393
:on-submit="onUpsertSubmit"
94-
@open="onUpsertOpen"
9594
></cl-upsert>
9695
</cl-crud>
9796
</div>
@@ -272,7 +271,7 @@ export default {
272271
prop: "password",
273272
label: "密码",
274273
span: 12,
275-
hidden: true,
274+
hidden: ":isEdit",
276275
component: {
277276
name: "el-input",
278277
attrs: {
@@ -363,7 +362,7 @@ export default {
363362
},
364363
{
365364
prop: "tips",
366-
hidden: true,
365+
hidden: ":isAdd",
367366
component: (
368367
<div>
369368
<i class="el-icon-warning"></i>
@@ -413,11 +412,6 @@ export default {
413412
render(list);
414413
},
415414
416-
onUpsertOpen(isEdit) {
417-
this.$refs["upsert"].toggleItem("password", isEdit);
418-
this.$refs["upsert"].toggleItem("tips", !isEdit);
419-
},
420-
421415
onUpsertSubmit(_, data, { next }) {
422416
let departmentId = data.departmentId;
423417

src/cool/modules/task/components/cron/cron.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ import Language from "./cn";
462462
export default {
463463
name: "vue-cron",
464464
465-
props: ["value", "data", "i18n", "showYear"],
465+
props: ["value", "data", "showYear"],
466466
467467
data() {
468468
return {

src/cool/modules/task/components/cron/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,13 @@ export default {
4848
render() {
4949
return (
5050
<el-popover v-model={this.visible} disabled={this.disabled || this.readonly}>
51-
<Cron
51+
<cron
5252
v-model={this.cron}
5353
{...{
54-
props: { i18n: "cn" },
5554
on: {
5655
close: this.close
5756
}
58-
}}></Cron>
57+
}}></cron>
5958
<el-input
6059
slot="reference"
6160
clearable

src/icons/svg/icon-tag (1).svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)