wms / wms4 · Commits

Commit cf8f7e0843477d489ead0c9699e19ba70fd5d13a

Authored by 谭毅彬
1 parent 443086ce

在线表单开发页面相关代码还原 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 4 changed files with 27 additions and 25 deletions
ant-design-vue-jeecg/package-lock.json
  View file @cf8f7e0
... ... @@ -9,6 +9,7 @@
9 9 "version": "3.1.0",
10 10 "dependencies": {
11 11 "@antv/data-set": "^0.11.4",
  12 + "@jeecg/antd-online-mini": "^3.1.0-beta",
12 13 "@tinymce/tinymce-vue": "2.1.0",
13 14 "@toast-ui/editor": "^2.1.2",
14 15 "ant-design-vue": "^1.7.2",
... ... @@ -1662,7 +1663,7 @@
1662 1663 },
1663 1664 "node_modules/@jeecg/antd-online-mini": {
1664 1665 "version": "3.1.0-beta",
1665   - "resolved": "https://registry.npmmirror.com/@jeecg/antd-online-mini/-/antd-online-mini-3.1.0-beta.tgz",
  1666 + "resolved": "https://registry.npmjs.org/@jeecg/antd-online-mini/-/antd-online-mini-3.1.0-beta.tgz",
1666 1667 "integrity": "sha512-pW0zWzExnxjlC3e7DzGYjQibLU22K/7N0kp1ddJrGgX33Ia/wq7ELOcwn6bLzITD89RcvX1JUW/om+IJ1PxOSw=="
1667 1668 },
1668 1669 "node_modules/@mrmlnc/readdir-enhanced": {
... ... @@ -23151,7 +23152,7 @@
23151 23152 },
23152 23153 "@jeecg/antd-online-mini": {
23153 23154 "version": "3.1.0-beta",
23154   - "resolved": "https://registry.npmmirror.com/@jeecg/antd-online-mini/-/antd-online-mini-3.1.0-beta.tgz",
  23155 + "resolved": "https://registry.npmjs.org/@jeecg/antd-online-mini/-/antd-online-mini-3.1.0-beta.tgz",
23155 23156 "integrity": "sha512-pW0zWzExnxjlC3e7DzGYjQibLU22K/7N0kp1ddJrGgX33Ia/wq7ELOcwn6bLzITD89RcvX1JUW/om+IJ1PxOSw=="
23156 23157 },
23157 23158 "@mrmlnc/readdir-enhanced": {
... ...
ant-design-vue-jeecg/package.json
  View file @cf8f7e0
... ... @@ -14,6 +14,7 @@
14 14 },
15 15 "dependencies": {
16 16 "@antv/data-set": "^0.11.4",
  17 + "@jeecg/antd-online-mini": "^3.1.0-beta",
17 18 "@tinymce/tinymce-vue": "2.1.0",
18 19 "@toast-ui/editor": "^2.1.2",
19 20 "ant-design-vue": "^1.7.2",
... ...
ant-design-vue-jeecg/src/main.js
  View file @cf8f7e0
... ... @@ -8,8 +8,8 @@ import router from &#39;./router&#39;
8 8 import store from './store/'
9 9 import {VueAxios} from "@/utils/request"
10 10  
11   -// require('@jeecg/antd-online-mini')
12   -// require('@jeecg/antd-online-mini/dist/OnlineForm.css')
  11 +require('@jeecg/antd-online-mini')
  12 +require('@jeecg/antd-online-mini/dist/OnlineForm.css')
13 13  
14 14 import Antd, {version} from 'ant-design-vue'
15 15  
... ...
ant-design-vue-jeecg/src/utils/util.js
  View file @cf8f7e0
... ... @@ -2,7 +2,7 @@ import Vue from &#39;vue&#39;
2 2 import * as api from '@/api/api'
3 3 import {isURL} from '@/utils/validate'
4 4 import {ACCESS_TOKEN} from '@/store/mutation-types'
5   -// import onlineCommons from '@jeecg/antd-online-mini'
  5 +import onlineCommons from '@jeecg/antd-online-mini'
6 6  
7 7 export function timeFix() {
8 8 const time = new Date()
... ... @@ -118,27 +118,27 @@ function generateChildRouters(data) {
118 118 }
119 119  
120 120 let componentPath
121   - // if (item.component == "modules/online/cgform/OnlCgformHeadList") {
122   - // componentPath = onlineCommons.OnlCgformHeadList
123   - // } else if (item.component == "modules/online/cgform/OnlCgformCopyList") {
124   - // componentPath = onlineCommons.OnlCgformCopyList
125   - // } else if (item.component == "modules/online/cgform/auto/OnlCgformAutoList") {
126   - // componentPath = onlineCommons.OnlCgformAutoList
127   - // } else if (item.component == "modules/online/cgform/auto/OnlCgformTreeList") {
128   - // componentPath = onlineCommons.OnlCgformTreeList
129   - // } else if (item.component == "modules/online/cgform/auto/erp/OnlCgformErpList") {
130   - // componentPath = onlineCommons.OnlCgformErpList
131   - // } else if (item.component == "modules/online/cgform/auto/tab/OnlCgformTabList") {
132   - // componentPath = onlineCommons.OnlCgformTabList
133   - // } else if (item.component == "modules/online/cgform/auto/innerTable/OnlCgformInnerTableList") {
134   - // componentPath = onlineCommons.OnlCgformInnerTableList
135   - // } else if (item.component == "modules/online/cgreport/OnlCgreportHeadList") {
136   - // componentPath = onlineCommons.OnlCgreportHeadList
137   - // } else if (item.component == "modules/online/cgreport/auto/OnlCgreportAutoList") {
138   - // componentPath = onlineCommons.OnlCgreportAutoList
139   - // } else {
  121 + if (item.component == "modules/online/cgform/OnlCgformHeadList") {
  122 + componentPath = onlineCommons.OnlCgformHeadList
  123 + } else if (item.component == "modules/online/cgform/OnlCgformCopyList") {
  124 + componentPath = onlineCommons.OnlCgformCopyList
  125 + } else if (item.component == "modules/online/cgform/auto/OnlCgformAutoList") {
  126 + componentPath = onlineCommons.OnlCgformAutoList
  127 + } else if (item.component == "modules/online/cgform/auto/OnlCgformTreeList") {
  128 + componentPath = onlineCommons.OnlCgformTreeList
  129 + } else if (item.component == "modules/online/cgform/auto/erp/OnlCgformErpList") {
  130 + componentPath = onlineCommons.OnlCgformErpList
  131 + } else if (item.component == "modules/online/cgform/auto/tab/OnlCgformTabList") {
  132 + componentPath = onlineCommons.OnlCgformTabList
  133 + } else if (item.component == "modules/online/cgform/auto/innerTable/OnlCgformInnerTableList") {
  134 + componentPath = onlineCommons.OnlCgformInnerTableList
  135 + } else if (item.component == "modules/online/cgreport/OnlCgreportHeadList") {
  136 + componentPath = onlineCommons.OnlCgreportHeadList
  137 + } else if (item.component == "modules/online/cgreport/auto/OnlCgreportAutoList") {
  138 + componentPath = onlineCommons.OnlCgreportAutoList
  139 + } else {
140 140 componentPath = resolve => require(['@/' + component + '.vue'], resolve)
141   - // }
  141 + }
142 142  
143 143 let menu = {
144 144 path: item.path,
... ...