From 43a3184bba52092efa06e7f880206b5aef821773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
<188633308@qq.com>
Date: Wed, 12 May 2021 23:20:00 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"update=20=E6=9E=84=E6=88=90=E8=A1=A8?=
=?UTF-8?q?=E5=8D=95=E9=A1=B5=E7=9A=84=E7=A7=8D=E5=AD=90"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit c74448b1fcb3ff2b0251260d444ff1ae55302d6b.
---
.../seed/form-page/only-form/index.vue | 105 -----
.../doc-code/seed/form-page/tab-form/tab.vue | 73 ----
.../seed/form-page/tab-form/tabPane.vue | 90 ----
.../doc-code/seed/{query-form => }/form.vue | 0
.../doc-code/seed/{query-form => }/query.vue | 0
.../seed/{query-form => }/treeLayout.vue | 0
Web/src/assets/style/app.less | 3 -
Web/src/assets/style/lib/checkbox.less | 10 -
Web/src/assets/style/lib/container.less | 4 -
Web/src/assets/style/lib/font-size.less | 4 +-
Web/src/assets/style/lib/form-page.less | 134 ------
Web/src/assets/style/lib/input.less | 6 -
Web/src/components/container/index.vue | 11 +-
Web/src/main.js | 2 -
.../pages/business/house/houseCode/form.vue | 281 +++++++++++++
.../business/house/houseCode/form/index.vue | 114 -----
.../business/house/houseCode/form/part.vue | 268 ------------
.../pages/business/house/houseCode/index.vue | 212 +++++++++-
.../house/houseInfo/form/base/building.vue | 392 ------------------
.../house/houseInfo/form/base/index.vue | 85 ----
.../business/house/houseInfo/form/index.vue | 71 ----
.../pages/business/house/houseInfo/index.vue | 10 -
Web/src/pages/system/_seed/README.md | 5 +
.../pages/system/_seed/form.vue} | 38 +-
Web/src/pages/system/_seed/index.vue | 216 ++++++++++
Web/src/pages/system/_seed/treeLayout.vue | 256 ++++++++++++
Web/src/pages/system/doc/highlight.js | 11 +-
Web/src/pages/system/doc/index.vue | 4 -
Web/src/pages/system/doc/seed/form.vue | 2 +-
Web/src/pages/system/doc/seed/pageForm.vue | 44 --
Web/src/pages/system/doc/seed/query.vue | 2 +-
Web/src/pages/system/doc/seed/treeLayout.vue | 2 +-
32 files changed, 980 insertions(+), 1475 deletions(-)
delete mode 100644 Web/public/doc-code/seed/form-page/only-form/index.vue
delete mode 100644 Web/public/doc-code/seed/form-page/tab-form/tab.vue
delete mode 100644 Web/public/doc-code/seed/form-page/tab-form/tabPane.vue
rename Web/public/doc-code/seed/{query-form => }/form.vue (100%)
rename Web/public/doc-code/seed/{query-form => }/query.vue (100%)
rename Web/public/doc-code/seed/{query-form => }/treeLayout.vue (100%)
delete mode 100644 Web/src/assets/style/lib/checkbox.less
delete mode 100644 Web/src/assets/style/lib/form-page.less
delete mode 100644 Web/src/assets/style/lib/input.less
create mode 100644 Web/src/pages/business/house/houseCode/form.vue
delete mode 100644 Web/src/pages/business/house/houseCode/form/index.vue
delete mode 100644 Web/src/pages/business/house/houseCode/form/part.vue
delete mode 100644 Web/src/pages/business/house/houseInfo/form/base/building.vue
delete mode 100644 Web/src/pages/business/house/houseInfo/form/base/index.vue
delete mode 100644 Web/src/pages/business/house/houseInfo/form/index.vue
delete mode 100644 Web/src/pages/business/house/houseInfo/index.vue
create mode 100644 Web/src/pages/system/_seed/README.md
rename Web/{public/doc-code/seed/form-page/only-form/part.vue => src/pages/system/_seed/form.vue} (80%)
create mode 100644 Web/src/pages/system/_seed/index.vue
create mode 100644 Web/src/pages/system/_seed/treeLayout.vue
delete mode 100644 Web/src/pages/system/doc/seed/pageForm.vue
diff --git a/Web/public/doc-code/seed/form-page/only-form/index.vue b/Web/public/doc-code/seed/form-page/only-form/index.vue
deleted file mode 100644
index 71cc94d..0000000
--- a/Web/public/doc-code/seed/form-page/only-form/index.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Web/public/doc-code/seed/form-page/tab-form/tab.vue b/Web/public/doc-code/seed/form-page/tab-form/tab.vue
deleted file mode 100644
index d907105..0000000
--- a/Web/public/doc-code/seed/form-page/tab-form/tab.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 保存
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Web/public/doc-code/seed/form-page/tab-form/tabPane.vue b/Web/public/doc-code/seed/form-page/tab-form/tabPane.vue
deleted file mode 100644
index 98deaf0..0000000
--- a/Web/public/doc-code/seed/form-page/tab-form/tabPane.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Web/public/doc-code/seed/query-form/form.vue b/Web/public/doc-code/seed/form.vue
similarity index 100%
rename from Web/public/doc-code/seed/query-form/form.vue
rename to Web/public/doc-code/seed/form.vue
diff --git a/Web/public/doc-code/seed/query-form/query.vue b/Web/public/doc-code/seed/query.vue
similarity index 100%
rename from Web/public/doc-code/seed/query-form/query.vue
rename to Web/public/doc-code/seed/query.vue
diff --git a/Web/public/doc-code/seed/query-form/treeLayout.vue b/Web/public/doc-code/seed/treeLayout.vue
similarity index 100%
rename from Web/public/doc-code/seed/query-form/treeLayout.vue
rename to Web/public/doc-code/seed/treeLayout.vue
diff --git a/Web/src/assets/style/app.less b/Web/src/assets/style/app.less
index 3049253..7919e32 100644
--- a/Web/src/assets/style/app.less
+++ b/Web/src/assets/style/app.less
@@ -21,11 +21,8 @@
@import './lib/table.less';
@import './lib/list.less';
@import './lib/form.less';
-@import './lib/form-page.less';
@import './lib/description.less';
-@import './lib/input.less';
@import './lib/select.less';
-@import './lib/checkbox.less';
@import './lib/cascader.less';
@import './lib/dropdown.less';
@import './lib/modal.less';
diff --git a/Web/src/assets/style/lib/checkbox.less b/Web/src/assets/style/lib/checkbox.less
deleted file mode 100644
index 1913738..0000000
--- a/Web/src/assets/style/lib/checkbox.less
+++ /dev/null
@@ -1,10 +0,0 @@
-@import (reference) '~@/assets/style/extend.less';
-.ant-checkbox-wrapper {
- margin-right: @padding-xs;
- &:last-child {
- margin-right: 0;
- }
- +.ant-checkbox-wrapper {
- margin-left: 0;
- }
-}
diff --git a/Web/src/assets/style/lib/container.less b/Web/src/assets/style/lib/container.less
index d7443e4..162aff0 100644
--- a/Web/src/assets/style/lib/container.less
+++ b/Web/src/assets/style/lib/container.less
@@ -37,7 +37,3 @@
.container-fluid {
.container-base();
}
-.container-flex {
- display: flex;
- justify-content: space-between;
-}
diff --git a/Web/src/assets/style/lib/font-size.less b/Web/src/assets/style/lib/font-size.less
index d9497af..08c8ffc 100644
--- a/Web/src/assets/style/lib/font-size.less
+++ b/Web/src/assets/style/lib/font-size.less
@@ -17,9 +17,9 @@ h4,
}
h5,
.h5 {
- font-size: 16px;
+ font-size: 14px;
}
h6,
.h6 {
- font-size: 14px;
+ font-size: 12px;
}
diff --git a/Web/src/assets/style/lib/form-page.less b/Web/src/assets/style/lib/form-page.less
deleted file mode 100644
index e083e86..0000000
--- a/Web/src/assets/style/lib/form-page.less
+++ /dev/null
@@ -1,134 +0,0 @@
-@import (reference) '~@/assets/style/extend.less';
-
-.yo-form-page {
- position: relative;
-
- height: 100%;
-
- >.ant-tabs {
- display: flex;
- flex-direction: column;
-
- height: 100%;
-
- >.ant-tabs-bar {
- margin-bottom: 0;
-
- background-color: @white;
-
- .ant-tabs-nav-container {
- height: @tabs-card-height + @padding-xs;
- padding: (@tabs-card-height + @padding-xs - @btn-height-base) / 2 @padding-md;
- }
-
- .ant-tabs-tab {
- .ant-btn();
-
- &:hover {
- border-color: @btn-default-border;
- }
- }
-
- .ant-tabs-tab {
- line-height: @btn-height-base;
-
- margin-right: -1px;
- }
-
- .ant-tabs-tab-active {
- z-index: 2;
-
- color: @btn-primary-color;
- border-color: @btn-primary-bg;
- background-color: @btn-primary-bg;
-
- &:hover {
- color: @btn-primary-color;
- border-color: color(~`colorPalette('@{btn-primary-bg}', 5) `);
- background-color: color(~`colorPalette('@{btn-primary-bg}', 5) `);
- }
- }
- }
-
- >.ant-tabs-content {
- position: relative;
-
- flex: 1;
-
- >.ant-tabs-tabpane {
- position: absolute;
- top: 0;
- left: 0;
-
- overflow: auto;
-
- width: 100%;
- height: 100%;
- }
- }
- }
-
- &--bar {
- position: sticky;
- bottom: 0;
- z-index: 200;
-
- &--with-tab {
- position: absolute;
-
- display: flex;
- align-items: flex-end;
-
- width: 100%;
- height: 0;
- padding-right: 7px;
-
- >.container-fluid {
- width: 100%;
- }
-
- +.ant-tabs {
- >.ant-tabs-content {
- >.ant-tabs-tabpane {
- padding-bottom: @padding-xs * 2 + @btn-height-base + @border-width-base * 2;
- }
- }
- }
- }
- }
-
- &--bar-inner {
- display: flex;
- justify-content: space-between;
-
- padding: @padding-xs @padding-md;
-
- border: @border-width-base @border-style-base @border-color-split;
- background-color: fade(@white, 80%);
-
- backdrop-filter: blur(5px);
-
- >:first-child {
- flex: 1;
- }
-
- .ant-btn {
- margin-left: @padding-sm;
- }
- }
-
- &--body {
- >.ant-card-body {
- padding: 0;
-
- >section {
- padding: @padding-lg;
-
- >h5 {
- border-left: @padding-xs @border-style-base @primary-color;
- padding-left: @padding-md;
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Web/src/assets/style/lib/input.less b/Web/src/assets/style/lib/input.less
deleted file mode 100644
index 2220f7c..0000000
--- a/Web/src/assets/style/lib/input.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import (reference) '~@/assets/style/extend.less';
-.yo-input-prefix-2 {
- .ant-input:not(:first-child) {
- padding-left: 45px;
- }
-}
diff --git a/Web/src/components/container/index.vue b/Web/src/components/container/index.vue
index a400420..549d3e3 100644
--- a/Web/src/components/container/index.vue
+++ b/Web/src/components/container/index.vue
@@ -1,10 +1,5 @@
-
@@ -14,10 +9,6 @@ export default {
mode: {
type: String,
},
- flex: {
- type: Boolean,
- default: false,
- },
},
};
\ No newline at end of file
diff --git a/Web/src/main.js b/Web/src/main.js
index 1ab253b..d5a3c78 100644
--- a/Web/src/main.js
+++ b/Web/src/main.js
@@ -82,8 +82,6 @@ import YoModalForm from './components/yoModalForm'
Vue.component('YoModalForm', YoModalForm)
import YoImage from './components/yoImage'
Vue.component('YoImage', YoImage)
-import YoFormLink from './components/yoFormLink'
-Vue.component('YoFormLink', YoFormLink)
/**
* 引入主题样式
diff --git a/Web/src/pages/business/house/houseCode/form.vue b/Web/src/pages/business/house/houseCode/form.vue
new file mode 100644
index 0000000..b93d05f
--- /dev/null
+++ b/Web/src/pages/business/house/houseCode/form.vue
@@ -0,0 +1,281 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 宁波市 -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+
+
+
+
+ {{ item.value }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/pages/business/house/houseCode/form/index.vue b/Web/src/pages/business/house/houseCode/form/index.vue
deleted file mode 100644
index 2942068..0000000
--- a/Web/src/pages/business/house/houseCode/form/index.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Web/src/pages/business/house/houseCode/form/part.vue b/Web/src/pages/business/house/houseCode/form/part.vue
deleted file mode 100644
index e4a7052..0000000
--- a/Web/src/pages/business/house/houseCode/form/part.vue
+++ /dev/null
@@ -1,268 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 宁波市 -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.value }}
-
-
-
-
- {{ item.value }}
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Web/src/pages/business/house/houseCode/index.vue b/Web/src/pages/business/house/houseCode/index.vue
index a2e4ffc..a10161b 100644
--- a/Web/src/pages/business/house/houseCode/index.vue
+++ b/Web/src/pages/business/house/houseCode/index.vue
@@ -1,10 +1,206 @@
-
-
+
+
+
+
+
+
+
+
+
+
+ 新增房屋编码
+
+
+
+
+
+
+
+ 编辑
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/pages/business/house/houseInfo/form/base/building.vue b/Web/src/pages/business/house/houseInfo/form/base/building.vue
deleted file mode 100644
index dbe0c88..0000000
--- a/Web/src/pages/business/house/houseInfo/form/base/building.vue
+++ /dev/null
@@ -1,392 +0,0 @@
-
-
-
-
-
-
-
-
- 测试区
-
-
-
-
- 测试街道
-
-
-
-
- 欧阳社区
-
-
-
-
- 片区一22(明湖片区)
-
-
-
-
- 宁波市-测试区-测试街道-欧阳社区-项目十二(项目十二)-001
-
-
-
-
- 330266066001012001
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.value }}
-
-
-
-
-
-
- {{ item.value }}
-
-
-
-
-
-
- {{ item.value }}
-
-
-
-
-
-
- {{ item.value }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 建筑层数
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Web/src/pages/business/house/houseInfo/form/base/index.vue b/Web/src/pages/business/house/houseInfo/form/base/index.vue
deleted file mode 100644
index fcd9e5d..0000000
--- a/Web/src/pages/business/house/houseInfo/form/base/index.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Web/src/pages/business/house/houseInfo/form/index.vue b/Web/src/pages/business/house/houseInfo/form/index.vue
deleted file mode 100644
index 2729df5..0000000
--- a/Web/src/pages/business/house/houseInfo/form/index.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 保存
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Web/src/pages/business/house/houseInfo/index.vue b/Web/src/pages/business/house/houseInfo/index.vue
deleted file mode 100644
index d7fceb3..0000000
--- a/Web/src/pages/business/house/houseInfo/index.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/Web/src/pages/system/_seed/README.md b/Web/src/pages/system/_seed/README.md
new file mode 100644
index 0000000..3dbb9d7
--- /dev/null
+++ b/Web/src/pages/system/_seed/README.md
@@ -0,0 +1,5 @@
+/**
+基本上所有列表页都可以通过拷贝此处的种子文件实现增删改查的功能
+所有带 ... 的注释是可以依据当前业务添加内容的地方
+其他所有尽量不要修改
+**/
\ No newline at end of file
diff --git a/Web/public/doc-code/seed/form-page/only-form/part.vue b/Web/src/pages/system/_seed/form.vue
similarity index 80%
rename from Web/public/doc-code/seed/form-page/only-form/part.vue
rename to Web/src/pages/system/_seed/form.vue
index 98dcf89..fb4579d 100644
--- a/Web/public/doc-code/seed/form-page/only-form/part.vue
+++ b/Web/src/pages/system/_seed/form.vue
@@ -1,21 +1,17 @@
-
+
-
-
+
+
+
+
@@ -26,13 +22,8 @@ const defaultForm = {
};
export default {
- props: ['param'],
-
data() {
return {
- labelCol: { flex: '150px' },
- wrapperCol: { flex: '1' },
-
/** 表单数据 */
form: {},
/** 验证格式 */
@@ -48,23 +39,16 @@ export default {
};
},
- async created() {
- await this.onInit();
- this.onFillData();
- },
-
methods: {
/**
* 必要的方法
* 在打开编辑页时允许填充数据
*/
- onFillData() {
+ onFillData(params) {
/** 将默认数据覆盖到form */
- const record = this.param && this.param.record;
-
this.form = this.$_.cloneDeep({
...defaultForm,
- ...record,
+ ...params.record,
/** 在此处添加其他默认数据转换 */
/* ... */
});
@@ -116,7 +100,7 @@ export default {
* 必要方法
* 加载当前表单中所需要的异步数据
*/
- async onInit() {
+ async onInit(params) {
this.loading = true;
/** 可以在这里await获取一些异步数据 */
/* ... */
diff --git a/Web/src/pages/system/_seed/index.vue b/Web/src/pages/system/_seed/index.vue
new file mode 100644
index 0000000..f30ce6d
--- /dev/null
+++ b/Web/src/pages/system/_seed/index.vue
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+
+
+ 新增...
+
+
+
+
+
+
+
+ 编辑
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/pages/system/_seed/treeLayout.vue b/Web/src/pages/system/_seed/treeLayout.vue
new file mode 100644
index 0000000..91e861f
--- /dev/null
+++ b/Web/src/pages/system/_seed/treeLayout.vue
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+
+
+
+
+
+ 新增机构
+
+
+
+
+
+
+
+ 编辑
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/highlight.js b/Web/src/pages/system/doc/highlight.js
index 25bea35..9b86ab0 100644
--- a/Web/src/pages/system/doc/highlight.js
+++ b/Web/src/pages/system/doc/highlight.js
@@ -32,7 +32,7 @@ export default {
this.baseCopy(this.code)
},
onCopyTemplate() {
- let code = '"' +
+ const code = '"' +
this.code
// 转义双引号 => \"
.replace(/"/g, '\\"')
@@ -43,15 +43,6 @@ export default {
// 替换行末 = ",
.replace(/\r/g, '",\r') +
'"'
- let flag = true
- while (flag) {
- const p = code.match(/\$\${.*?}/)
- if (p && p[0]) {
- code = code.replace(p[0], `\$\{${p[0].slice(1)}\}`)
- } else {
- flag = false
- }
- }
this.baseCopy(code)
},
},
diff --git a/Web/src/pages/system/doc/index.vue b/Web/src/pages/system/doc/index.vue
index 9275b0e..674f4db 100644
--- a/Web/src/pages/system/doc/index.vue
+++ b/Web/src/pages/system/doc/index.vue
@@ -176,10 +176,6 @@ const docs = [
title: '树-查询表格',
path: '/seed/treeLayout',
},
- {
- title: '表单页',
- path: '/seed/pageForm',
- },
],
},
{
diff --git a/Web/src/pages/system/doc/seed/form.vue b/Web/src/pages/system/doc/seed/form.vue
index f2db59b..c7287d0 100644
--- a/Web/src/pages/system/doc/seed/form.vue
+++ b/Web/src/pages/system/doc/seed/form.vue
@@ -4,7 +4,7 @@
当前版本
1.2
-
+
diff --git a/Web/src/pages/system/doc/seed/query.vue b/Web/src/pages/system/doc/seed/query.vue
index 94b29c4..e9cebd3 100644
--- a/Web/src/pages/system/doc/seed/query.vue
+++ b/Web/src/pages/system/doc/seed/query.vue
@@ -4,7 +4,7 @@
当前版本
1.2
-
+