-
-
+
-
+
-
+
+
0
+ return flag;
+ },
getElement(id, noCaseId = false) {
if (!this.el[id]) {
this.el[id] = document.getElementById((noCaseId ? '' : this.caseId) + id)
@@ -1274,7 +1303,7 @@
selectValues[inputId] = undefined
}
- } else if (column.type === FormTypes.date || column.type === FormTypes.datetime) {
+ } else if (column.type === FormTypes.date || column.type === FormTypes.datetime || column.type === FormTypes.time) {
jdateValues[inputId] = sourceValue
} else if (column.type === FormTypes.slot) {
@@ -1286,7 +1315,7 @@
departCompValues[inputId] = sourceValue
} else if (column.type === FormTypes.sel_user) {
userCompValues[inputId] = sourceValue
- } else if (column.type === FormTypes.input_pop) {
+ } else if (column.type === FormTypes.input_pop || column.type === 'textarea') {
jInputPopValues[inputId] = sourceValue
} else if (column.type === FormTypes.radio) {
radioValues[inputId] = sourceValue
@@ -1588,7 +1617,7 @@
value[column.key] = selected
}
- } else if (column.type === FormTypes.date || column.type === FormTypes.datetime) {
+ } else if (column.type === FormTypes.date || column.type === FormTypes.datetime || column.type === FormTypes.time) {
value[column.key] = this.jdateValues[inputId]
} else if (column.type === FormTypes.sel_depart) {
@@ -1597,7 +1626,7 @@
} else if (column.type === FormTypes.sel_user) {
value[column.key] = this.userCompValues[inputId]
- } else if (column.type === FormTypes.input_pop) {
+ } else if (column.type === FormTypes.input_pop || column.type === 'textarea') {
value[column.key] = this.jInputPopValues[inputId]
} else if (column.type === FormTypes.upload) {
@@ -1793,13 +1822,13 @@
}
this.$set(this.checkboxValues, key, sourceValue)
edited = true
- } else if (column.type === FormTypes.date || column.type === FormTypes.datetime) {
+ } else if (column.type === FormTypes.date || column.type === FormTypes.datetime || column.type === FormTypes.time) {
edited = this.setOneValue(this.jdateValues, modelKey, newValue)
} else if (column.type === FormTypes.sel_depart) {
edited = this.setOneValue(this.departCompValues, modelKey, newValue)
} else if (column.type === FormTypes.sel_user) {
edited = this.setOneValue(this.userCompValues, modelKey, newValue)
- } else if (column.type === FormTypes.input_pop) {
+ } else if (column.type === FormTypes.input_pop || column.type === 'textarea') {
edited = this.setOneValue(this.jInputPopValues, modelKey, newValue)
} else if (column.type === FormTypes.slot) {
edited = this.setOneValue(this.slotValues, modelKey, newValue)
@@ -2143,6 +2172,29 @@
clearSelection() {
this.selectedRowIds = []
},
+ // 获取当前选中的行
+ getSelection() {
+ return this.selectedRowIds.map(id => this.getCleanId(id))
+ },
+ // 设置当前选中的行
+ async setSelection(selectedRowIds) {
+ if (Array.isArray(selectedRowIds) && selectedRowIds.length > 0) {
+ // 兼容IE
+ await this.getElementPromise('tbody')
+ await this.$nextTick()
+ this.selectedRowIds = selectedRowIds.map(id => {
+ let temp = id
+ if (!this.hasCaseId(id)) {
+ temp = this.caseId + id
+ }
+ return temp
+ })
+ }
+ },
+ // 切换全选状态
+ toggleSelectionAll() {
+ this.handleChangeCheckedAll()
+ },
/** 用于搜索下拉框中的内容 */
handleSelectFilterOption(input, option, column) {
if (column.allowSearch === true || column.allowInput === true) {
@@ -2350,11 +2402,7 @@
this.validateOneInput(value, row, column, this.notPassedIds, true, 'change')
// 触发valueChange 事件
- if (showTime) {
- this.elemValueChange(FormTypes.datetime, row, column, value)
- } else {
- this.elemValueChange(FormTypes.date, row, column, value)
- }
+ this.elemValueChange(column.type, row, column, value)
},
//部门组件值改变
handleChangeDepartCommon(value, id, row, column){
@@ -2736,6 +2784,11 @@
if (col.type === FormTypes.select && (col.allowInput === true || col.allowSearch === true)) {
props['showSearch'] = true
}
+ if (col.type === FormTypes.sel_depart || col.type === FormTypes.sel_user) {
+ let { storeField, textField } = this.getStoreAndTextField(col)
+ props['store'] = storeField
+ props['text'] = textField
+ }
// 判断是否是禁用的列
props['disabled'] = (typeof col['disabled'] === 'boolean' ? col['disabled'] : props['disabled'])
@@ -2753,6 +2806,42 @@
return props
},
+ /**获取部门选择 、用户选择的存储字段、展示字段*/
+ getStoreAndTextField(col){
+ let storeField = '', textField = ''
+ if(col.type === FormTypes.sel_depart){
+ storeField = 'id'
+ textField = 'departName'
+ }else if(col.type === FormTypes.sel_user){
+ storeField = 'username'
+ textField = 'realname'
+ }
+ if(col.fieldExtendJson){
+ // online逻辑
+ let tempJson = JSON.parse(col.fieldExtendJson)
+ if(tempJson){
+ if(tempJson.store){
+ storeField = tempJson.store
+ }
+ if(tempJson.text){
+ textField = tempJson.text
+ }
+ }
+ }else{
+ // 实际开发逻辑
+ if(col.store){
+ storeField = col.store
+ }
+ if(col.text){
+ textField = col.text
+ }
+ }
+ return {
+ storeField,
+ textField
+ }
+ },
+
/** 辅助方法：防止过快点击，如果点击过快的话就返回 true */
checkTooFastClick(key = 'default', ms = 300) {
let nowTime = Date.now()
@@ -2966,6 +3055,21 @@
}else{
return this.excludeCode.indexOf(code)<0
}
+ },
+ // 判断用户、部门组件是否多选
+ isMultipleSelect(column){
+ let jsonStr = column.fieldExtendJson
+ if(jsonStr){
+ // online
+ let config = JSON.parse(jsonStr)
+ if(config && config['multiSelect']==false){
+ return false
+ }
+ }else if(column.multi==false){
+ // 实际开发
+ return false
+ }
+ return true;
}
},
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue b/ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue
deleted file mode 100644
index 45165f0b..00000000
--- a/ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-
-
-
- {{ title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JSelectMultiple.vue b/ant-design-vue-jeecg/src/components/jeecg/JSelectMultiple.vue
index de119db8..14dc837c 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JSelectMultiple.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JSelectMultiple.vue
@@ -1,5 +1,5 @@
-
+
0)
for (let param of params) {
@@ -388,7 +388,7 @@
}
}
console.debug('---高级查询参数--->', { params, matchType })
- this.$emit(this.callback, params, matchType)
+ this.$emit(this.callback, params, matchType, loadStatus)
},
handleCancel() {
this.close()
@@ -428,9 +428,13 @@
handleOpen() {
this.show()
},
+ handleOutReset(loadStaus=true) {
+ this.resetLine()
+ this.emitCallback({}, loadStaus)
+ },
handleReset() {
this.resetLine()
- this.emitCallback()
+ this.emitCallback({}, true)
},
handleSave() {
let queryParams = this.removeEmptyObject(this.queryParamsModel)
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue
index 5db1ecb5..d583808f 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue
@@ -16,6 +16,8 @@
:multi="multi"
:rootOpened="rootOpened"
:depart-id="departIds"
+ :store="storeField()"
+ :text="textField()"
@ok="handleOK"
@initComp="initComp"/>
@@ -68,7 +70,7 @@
}
},
multi(){
- if(this.cellProps.multi==false){
+ if(this.cellProps.multi==false || this.originColumn.multi===false){
return false
}else{
return true
@@ -101,15 +103,17 @@
handleEmpty(){
this.handleOK('')
},
- handleOK(rows, idstr) {
+ handleOK(rows) {
let value = ''
if (!rows && rows.length <= 0) {
this.departNames = ''
this.departIds = ''
} else {
- value = rows.map(row => row[this.customReturnField]).join(',')
- this.departNames = rows.map(row => row['departName']).join(',')
- this.departIds = idstr
+ let storeField = this.storeField();
+ let textField = this.textField();
+ value = rows.map(row => row[storeField]).join(',')
+ this.departNames = rows.map(row => row[textField]).join(',')
+ this.departIds = value
}
this.handleChangeCommon(this.departIds)
},
@@ -118,6 +122,34 @@
},
handleChange(value) {
this.handleChangeCommon(value)
+ },
+ storeField(){
+ if(this.originColumn){
+ const str = this.originColumn.fieldExtendJson
+ if(str){
+ let json = JSON.parse(str)
+ if(json && json.store){
+ return json.store
+ }
+ }else if(this.originColumn.store){
+ return this.originColumn.store
+ }
+ }
+ return 'id'
+ },
+ textField(){
+ if(this.originColumn){
+ const str = this.originColumn.fieldExtendJson
+ if(str){
+ let json = JSON.parse(str)
+ if(json && json.text){
+ return json.text
+ }
+ }else if(this.originColumn.text){
+ return this.originColumn.text
+ }
+ }
+ return 'departName'
}
},
enhanced: {
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeSelectCell.vue b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeSelectCell.vue
index 14d8ef69..e84a19e9 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeSelectCell.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeSelectCell.vue
@@ -94,7 +94,6 @@
methods: {
handleChange(value) {
- debugger
// 处理下级联动
let linkage = this.renderOptions.linkage
if (linkage) {
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeTimeCell.vue b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeTimeCell.vue
new file mode 100644
index 00000000..a1f435e3
--- /dev/null
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeTimeCell.vue
@@ -0,0 +1,57 @@
+
+
-
+
@@ -53,6 +53,10 @@
type: Boolean,
default: false,
},
+ placeholder:{
+ type:String,
+ required:false
+ }
},
data(){
diff --git a/ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue b/ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue
index df7d3977..5d14dc77 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue
@@ -74,6 +74,7 @@
import {filterObj} from '@/utils/util'
import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
import { httpGroupRequest } from '@/api/GroupRequest.js'
+ import md5 from 'md5'
const MODAL_WIDTH = 1200;
export default {
@@ -390,9 +391,12 @@
}
//update-end---author:liusq Date:20210203 for：pop选择器列主键问题 issues/I29P9Q------------
})
- if(res.length>50){
+ // update-begin---author:taoyan Date:20211025 for：jpopup 表格key重复BUG /issues/3121
+ res = md5(res)
+ /*if(res.length>50){
res = res.substring(0,50)
- }
+ }*/
+ // update-end---author:taoyan Date:20211025 for：jpopup 表格key重复BUG /issues/3121
return res
},
diff --git a/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue b/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue
index 4028e271..258ce4ff 100644
--- a/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue
+++ b/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue
@@ -219,10 +219,20 @@
cacheRouterArray.splice(cacheRouterArray.findIndex(item => item === componentName), 1)
Vue.ls.set(CACHE_INCLUDED_ROUTES, cacheRouterArray)
}
+ this.emitPageClosed(removeRoute[0])
}
//update-end--Author:scott Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
},
+ // 触发 page-closed （页面关闭）全局事件
+ emitPageClosed(closedRoute) {
+ this.$root.$emit('page-closed', {
+ closedRoute,
+ pageList: this.pageList,
+ linkList: this.linkList,
+ activePage: this.activePage
+ })
+ },
onContextmenu(e) {
const pagekey = this.getPageKey(e.target)
if (pagekey !== null) {
diff --git a/ant-design-vue-jeecg/src/main.js b/ant-design-vue-jeecg/src/main.js
index 108922a7..0809df2d 100644
--- a/ant-design-vue-jeecg/src/main.js
+++ b/ant-design-vue-jeecg/src/main.js
@@ -20,6 +20,7 @@ import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less'
import '@/permission' // permission control
import '@/utils/filter' // base filter
import Print from 'vue-print-nb-jeecg'
+/*import '@babel/polyfill'*/
import preview from 'vue-photo-preview'
import 'vue-photo-preview/dist/skin.css'
import SSO from '@/cas/sso.js'
diff --git a/ant-design-vue-jeecg/src/mixins/OnlineCommonUtil.js b/ant-design-vue-jeecg/src/mixins/OnlineCommonUtil.js
index 5ec8004e..b48220a9 100644
--- a/ant-design-vue-jeecg/src/mixins/OnlineCommonUtil.js
+++ b/ant-design-vue-jeecg/src/mixins/OnlineCommonUtil.js
@@ -10,7 +10,7 @@ const onlUtil = {
}
},
created(){
- this.mixin_pca = new Area(this.$Jpcaa)
+ this.mixin_pca = new Area()
},
methods:{
simpleDateFormat(millisecond, format){
diff --git a/ant-design-vue-jeecg/src/store/getters.js b/ant-design-vue-jeecg/src/store/getters.js
index 6e295d31..a6a1e815 100644
--- a/ant-design-vue-jeecg/src/store/getters.js
+++ b/ant-design-vue-jeecg/src/store/getters.js
@@ -16,7 +16,8 @@ const getters = {
enhanceJs:(state) => (code) => {
state.enhance.enhanceJs[code] = Vue.ls.get(ENHANCE_PRE+code);
return state.enhance.enhanceJs[code]
- }
+ },
+ sysSafeMode: state => state.user.sysSafeMode,
}
diff --git a/ant-design-vue-jeecg/src/store/modules/user.js b/ant-design-vue-jeecg/src/store/modules/user.js
index d3f2706b..c2147564 100644
--- a/ant-design-vue-jeecg/src/store/modules/user.js
+++ b/ant-design-vue-jeecg/src/store/modules/user.js
@@ -14,7 +14,9 @@ const user = {
welcome: '',
avatar: '',
permissionList: [],
- info: {}
+ info: {},
+ // 系统安全模式
+ sysSafeMode: null,
},
mutations: {
@@ -38,6 +40,13 @@ const user = {
SET_TENANT: (state, id) => {
state.tenantid = id
},
+ SET_SYS_SAFE_MODE: (state, sysSafeMode) => {
+ if (typeof sysSafeMode === 'boolean') {
+ state.sysSafeMode = sysSafeMode
+ } else {
+ state.sysSafeMode = false
+ }
+ },
},
actions: {
@@ -124,20 +133,22 @@ const user = {
sessionStorage.setItem(USER_AUTH,JSON.stringify(authData));
sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData));
if (menuData && menuData.length > 0) {
- //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
- menuData.forEach((item, index) => {
- if (item["children"]) {
- let hasChildrenMenu = item["children"].filter((i) => {
- return !i.hidden || i.hidden == false
- })
- if (hasChildrenMenu == null || hasChildrenMenu.length == 0) {
- item["hidden"] = true
- }
- }
- })
- //console.log(" menu show json ", menuData)
- //update--end--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
+ // //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
+ // menuData.forEach((item, index) => {
+ // if (item["children"]) {
+ // let hasChildrenMenu = item["children"].filter((i) => {
+ // return !i.hidden || i.hidden == false
+ // })
+ // if (hasChildrenMenu == null || hasChildrenMenu.length == 0) {
+ // item["hidden"] = true
+ // }
+ // }
+ // })
+ // //console.log(" menu show json ", menuData)
+ // //update--end--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
commit('SET_PERMISSIONLIST', menuData)
+ // 设置系统安全模式
+ commit('SET_SYS_SAFE_MODE', response.result.sysSafeMode)
} else {
reject('getPermissionList: permissions must be a non-null array !')
}
diff --git a/ant-design-vue-jeecg/src/utils/JEditableTableUtil.js b/ant-design-vue-jeecg/src/utils/JEditableTableUtil.js
index 5f89dab3..83faa9c3 100644
--- a/ant-design-vue-jeecg/src/utils/JEditableTableUtil.js
+++ b/ant-design-vue-jeecg/src/utils/JEditableTableUtil.js
@@ -8,6 +8,7 @@ const FormTypes = {
select: 'select',
date: 'date',
datetime: 'datetime',
+ time: 'time',
upload: 'upload',
file: 'file',
image: 'image',
diff --git a/ant-design-vue-jeecg/src/utils/request.js b/ant-design-vue-jeecg/src/utils/request.js
index 12634fd5..f7ea2fe8 100644
--- a/ant-design-vue-jeecg/src/utils/request.js
+++ b/ant-design-vue-jeecg/src/utils/request.js
@@ -75,7 +75,7 @@ const err = (error) => {
Vue.prototype.$Jnotification.error({ message: '系统提示', description: '网络超时'})
break
case 401:
- Vue.prototype.$Jnotification.error({ message: '系统提示', description:'未授权，请重新登录',duration: 4})
+ Vue.prototype.$Jnotification.error({ message: '系统提示', description:'很抱歉，登录已过期，请重新登录',duration: 4})
if (token) {
store.dispatch('Logout').then(() => {
setTimeout(() => {
diff --git a/ant-design-vue-jeecg/src/utils/util.js b/ant-design-vue-jeecg/src/utils/util.js
index 62ead493..9200d75e 100644
--- a/ant-design-vue-jeecg/src/utils/util.js
+++ b/ant-design-vue-jeecg/src/utils/util.js
@@ -591,3 +591,39 @@ export function getReportPrintUrl(url, id, open) {
}
return url
}
+
+/**
+ * JS实现AOP切面
+ *
+ * @param obj 包含函数的对象
+ * @param funcName 要切面的函数名
+ * @param callback 执行方法前的回调，用于切面，callback的返回值就是funcName最终的返回值
+ */
+export function aspectAroundFunction(obj, funcName, callback) {
+ if (typeof callback !== 'function' || !obj) {
+ console.warn('【aspectAroundFunction】obj或callback格式不正确')
+ return
+ }
+ // 保存原来的函数
+ let func = obj[funcName]
+ if (typeof func !== 'function') {
+ console.warn('【aspectAroundFunction】' + funcName + '不是一个方法')
+ return
+ }
+ // 赋值新方法
+ // 实现当外部调用 funcName 时，首先调用我定义的新方法
+ // 然后调用传入的callback方法，以决定是否执行 funcName，以及更改参数、返回值
+ obj[funcName] = function (...args) {
+ return callback({
+ args,
+ // 只有执行 proceed 才会真正执行给定的 funcName 方法
+ proceed() {
+ try {
+ return func.apply(obj, args)
+ } catch (e) {
+ console.error(e)
+ }
+ },
+ })
+ }
+}
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/jeecg/JVxeDemo/JVxeDemo3.vue b/ant-design-vue-jeecg/src/views/jeecg/JVxeDemo/JVxeDemo3.vue
index 91ac1421..6abd376d 100644
--- a/ant-design-vue-jeecg/src/views/jeecg/JVxeDemo/JVxeDemo3.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/JVxeDemo/JVxeDemo3.vue
@@ -14,6 +14,7 @@
diff --git a/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue b/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue
index b78091e3..63036dd9 100644
--- a/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue
@@ -268,6 +268,7 @@
placeholder="请选择菜单"
dict="sys_permission,name,id"
pidField="parent_id"
+ hasChildField="is_leaf"
pidValue=""
/>
@@ -283,6 +284,7 @@
placeholder="请选择菜单"
dict="sys_permission,name,id"
pidField="parent_id"
+ hasChildField="is_leaf"
pidValue=""
multiple
/>
diff --git a/ant-design-vue-jeecg/src/views/system/UserList.vue b/ant-design-vue-jeecg/src/views/system/UserList.vue
index 5a2f91a6..73dceb5e 100644
--- a/ant-design-vue-jeecg/src/views/system/UserList.vue
+++ b/ant-design-vue-jeecg/src/views/system/UserList.vue
@@ -156,10 +156,6 @@
-
- 代理人
-
-
@@ -378,10 +374,6 @@
handleChangePassword(username) {
this.$refs.passwordmodal.show(username);
},
- handleAgentSettings(username){
- this.$refs.sysUserAgentModal.agentSettings(username);
- this.$refs.sysUserAgentModal.title = "用户代理人设置";
- },
passwordModalOk() {
//TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
},
diff --git a/ant-design-vue-jeecg/src/views/user/alteration/Step1.vue b/ant-design-vue-jeecg/src/views/user/alteration/Step1.vue
deleted file mode 100644
index 7cace124..00000000
--- a/ant-design-vue-jeecg/src/views/user/alteration/Step1.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
- 使用已有账户登录
- 下一步
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/vue.config.js b/ant-design-vue-jeecg/vue.config.js
index 2a50d917..ffc45965 100644
--- a/ant-design-vue-jeecg/vue.config.js
+++ b/ant-design-vue-jeecg/vue.config.js
@@ -14,6 +14,14 @@ module.exports = {
*/
// 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
productionSourceMap: false,
+ // 多入口配置
+ // pages: {
+ // index: {
+ // entry: 'src/main.js',
+ // template: 'public/index.html',
+ // filename: 'index.html',
+ // }
+ // },
//打包app时放开该配置
//publicPath:'./',
configureWebpack: config => {
diff --git a/ant-design-vue-jeecg/yarn.lock b/ant-design-vue-jeecg/yarn.lock
index 43103bfe..60c1480f 100644
--- a/ant-design-vue-jeecg/yarn.lock
+++ b/ant-design-vue-jeecg/yarn.lock
@@ -888,10 +888,10 @@
cssnano-preset-default "^4.0.0"
postcss "^7.0.0"
-"@jeecg/antd-online-mini@2.4.6-beta5":
- version "2.4.6-beta5"
- resolved "https://registry.npmjs.org/@jeecg/antd-online-mini/-/antd-online-mini-2.4.6-beta5.tgz#d019ddcd87838773407c3052c21ba45163bfa76b"
- integrity sha512-js+WOJdvqE31GvVkAt1VLD0L50uHYhY6gE+g8XqJoUS/JD6q4eYyHOKsGj6tG0TlNbCiAFzZBHo6bFWGVI/miQ==
+"@jeecg/antd-online-mini@3.0.0-beta":
+ version "3.0.0-beta"
+ resolved "https://registry.npmjs.org/@jeecg/antd-online-mini/-/antd-online-mini-3.0.0-beta.tgz#bd7cbbd30c7c2cdee9d816ad996cd9a58378dc95"
+ integrity sha512-V2JwKeBy8WinDrIcGaZyr+FwmF63aItR8dEO570qVhw+Gfz+E9p+fE7SNmSDdbjNu4yiKfsavzdl2JvG4pwgXA==
"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
@@ -1659,9 +1659,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
color-convert "^2.0.1"
ant-design-vue@^1.7.2:
- version "1.7.7"
- resolved "https://registry.nlark.com/ant-design-vue/download/ant-design-vue-1.7.7.tgz#621cca28c89e2887ec391e5c129c34d463f3803e"
- integrity sha1-YhzKKMieKIfsOR5cEpw01GPzgD4=
+ version "1.7.8"
+ resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.8.tgz#1abbf86b68a4f5b1000bea0487b8031dc0001661"
+ integrity sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A==
dependencies:
"@ant-design/icons" "^2.1.1"
"@ant-design/icons-vue" "^2.0.0"
@@ -2892,8 +2892,8 @@ cache-loader@^2.0.1:
call-bind@^1.0.0:
version "1.0.2"
- resolved "https://registry.nlark.com/call-bind/download/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
- integrity sha1-sdTonmiBGcPJqQOtMKuy9qkZvjw=
+ resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+ integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
dependencies:
function-bind "^1.1.1"
get-intrinsic "^1.0.2"
@@ -3086,8 +3086,8 @@ check-types@^8.0.3:
china-area-data@^5.0.1:
version "5.0.1"
- resolved "https://registry.npm.taobao.org/china-area-data/download/china-area-data-5.0.1.tgz#7943b83a0619f033bb5893da80cb46e52e44be66"
- integrity sha1-eUO4OgYZ8DO7WJPagMtG5S5EvmY=
+ resolved "https://registry.npmjs.org/china-area-data/-/china-area-data-5.0.1.tgz#7943b83a0619f033bb5893da80cb46e52e44be66"
+ integrity sha512-BQDPpiv5Nn+018ekcJK2oSD9PAD+E1bvXB0wgabc//dFVS/KvRqCgg0QOEUt3vBkx9XzB5a9BmkJCEZDBxVjVw==
chokidar@^2.1.2, chokidar@^2.1.8:
version "2.1.8"
@@ -3670,8 +3670,8 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
cron-parser@^2.10.0:
version "2.18.0"
- resolved "https://registry.nlark.com/cron-parser/download/cron-parser-2.18.0.tgz#de1bb0ad528c815548371993f81a54e5a089edcf"
- integrity sha1-3huwrVKMgVVINxmT+BpU5aCJ7c8=
+ resolved "https://registry.npmjs.org/cron-parser/-/cron-parser-2.18.0.tgz#de1bb0ad528c815548371993f81a54e5a089edcf"
+ integrity sha512-s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==
dependencies:
is-nan "^1.3.0"
moment-timezone "^0.5.31"
@@ -5696,8 +5696,8 @@ get-caller-file@^2.0.1:
get-intrinsic@^1.0.2:
version "1.1.1"
- resolved "https://registry.nlark.com/get-intrinsic/download/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
- integrity sha1-FfWfN2+FXERpY5SPDSTNNje0q8Y=
+ resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+ integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
dependencies:
function-bind "^1.1.1"
has "^1.0.3"
@@ -6618,8 +6618,8 @@ is-mobile@^2.2.1:
is-nan@^1.3.0:
version "1.3.2"
- resolved "https://registry.npm.taobao.org/is-nan/download/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
- integrity sha1-BDpUreoxdItVts1OCara+mm9nh0=
+ resolved "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
+ integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
dependencies:
call-bind "^1.0.0"
define-properties "^1.1.3"
@@ -7672,8 +7672,8 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.0, mkdirp@~0.5.1:
moment-timezone@^0.5.31:
version "0.5.33"
- resolved "https://registry.nlark.com/moment-timezone/download/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"
- integrity sha1-slL9a7V/NBybWaWrYajlGnO70iw=
+ resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"
+ integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==
dependencies:
moment ">= 2.9.0"
-