[修改]修改两个组件的父名称

This commit is contained in:
zer0Black
2021-03-11 09:53:44 +08:00
parent 042d25053f
commit 35eb1449d4
135 changed files with 164 additions and 165 deletions
+1 -2
View File
@@ -7,8 +7,7 @@ Overview
---- ----
基于 [Ant Design of Vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/) 实现的 Ant Design Pro Vue 版 基于 [Ant Design of Vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/) 实现的 Ant Design Pro Vue 版
Jero-boot 的前UI框架,采用前后端分离方案,提供强大代码生成器的快速开发平台。 Jero-boot 的前UI框架,采用前后端分离方案,提供强大代码生成器的快速开发平台。
前端页面代码和后端功能代码一键生成,不需要写任何代码,保持jeecg一贯的强大!!
@@ -61,11 +61,11 @@
<script> <script>
import { getFileAccessHttpUrl } from '@api/manage' import { getFileAccessHttpUrl } from '@api/manage'
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
import JFilePop from '@/components/jeecg/minipop/JFilePop' import JFilePop from '@/components/jero/minipop/JFilePop'
import JVxeUploadCell from '@/components/jeecg/JVxeTable/components/cells/JVxeUploadCell' import JVxeUploadCell from '@/components/jero/JVxeTable/components/cells/JVxeUploadCell'
export default { export default {
name: 'JVxeFileCell', name: 'JVxeFileCell',
@@ -69,11 +69,11 @@
<script> <script>
import { getFileAccessHttpUrl } from '@api/manage' import { getFileAccessHttpUrl } from '@api/manage'
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
import JFilePop from '@/components/jeecg/minipop/JFilePop' import JFilePop from '@/components/jero/minipop/JFilePop'
import JVxeUploadCell from '@/components/jeecg/JVxeTable/components/cells/JVxeUploadCell' import JVxeUploadCell from '@/components/jero/JVxeTable/components/cells/JVxeUploadCell'
export default { export default {
name: 'JVxeImageCell', name: 'JVxeImageCell',
@@ -6,7 +6,7 @@
</template> </template>
<script> <script>
import JVxeCellMixins, { vModel, dispatchEvent } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins, { vModel, dispatchEvent } from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
export default { export default {
name: 'JVxePopupCell', name: 'JVxePopupCell',
@@ -16,7 +16,7 @@
</template> </template>
<script> <script>
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
export default { export default {
name: 'JVxeRadioCell', name: 'JVxeRadioCell',
@@ -3,7 +3,7 @@ import { getAction } from '@/api/manage'
import { cloneObject } from '@/utils/util' import { cloneObject } from '@/utils/util'
import { filterDictText } from '@/components/dict/JDictSelectUtil' import { filterDictText } from '@/components/dict/JDictSelectUtil'
import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api' import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
import JVxeCellMixins, { dispatchEvent } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins, { dispatchEvent } from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
/** 公共资源 */ /** 公共资源 */
const common = { const common = {
+3 -3
View File
@@ -1,11 +1,11 @@
import { installCell, JVXETypes } from '@/components/jeecg/JVxeTable' import { installCell, JVXETypes } from '@/components/jero/JVxeTable'
import JVxePopupCell from './JVxePopupCell' import JVxePopupCell from './JVxePopupCell'
import { DictSearchInputCell, DictSearchSpanCell } from './JVxeSelectDictSearchCell' import { DictSearchInputCell, DictSearchSpanCell } from './JVxeSelectDictSearchCell'
import JVxeFileCell from './JVxeFileCell' import JVxeFileCell from './JVxeFileCell'
import JVxeImageCell from './JVxeImageCell' import JVxeImageCell from './JVxeImageCell'
import JVxeRadioCell from './JVxeRadioCell' import JVxeRadioCell from './JVxeRadioCell'
import JVxeSelectCell from '@comp/jeecg/JVxeTable/components/cells/JVxeSelectCell' import JVxeSelectCell from '@comp/jero/JVxeTable/components/cells/JVxeSelectCell'
import JVxeTextareaCell from '@comp/jeecg/JVxeTable/components/cells/JVxeTextareaCell' import JVxeTextareaCell from '@comp/jero/JVxeTable/components/cells/JVxeTextareaCell'
// 注册online组件 // 注册online组件
JVXETypes.input_pop = 'input_pop' JVXETypes.input_pop = 'input_pop'
+1 -1
View File
@@ -219,7 +219,7 @@ import LineChartMultid from '@/components/chart/LineChartMultid'
##### fields 示例 ##### fields 示例
```json ```json
["jeecg", "jeebt"] ["jero", "jeebt"]
``` ```
##### dataSource 示例 ##### dataSource 示例
@@ -673,11 +673,11 @@
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
import { FormTypes, VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil' import { FormTypes, VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
import { cloneObject, randomString, randomNumber, getEventPath } from '@/utils/util' import { cloneObject, randomString, randomNumber, getEventPath } from '@/utils/util'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jero/JDate'
import { filterDictText, initDictOptions } from '@/components/dict/JDictSelectUtil' import { filterDictText, initDictOptions } from '@/components/dict/JDictSelectUtil'
import { getFileAccessHttpUrl } from '@/api/manage'; import { getFileAccessHttpUrl } from '@/api/manage';
import JInputPop from '@/components/jeecg/minipop/JInputPop' import JInputPop from '@/components/jero/minipop/JInputPop'
import JFilePop from '@/components/jeecg/minipop/JFilePop' import JFilePop from '@/components/jero/minipop/JFilePop'
import { getNoAuthCols } from "@/utils/authFilter" import { getNoAuthCols } from "@/utils/authFilter"
// 行高需要在实例加载完成前用到 // 行高需要在实例加载完成前用到
@@ -1,5 +1,5 @@
<template> <template>
<div :class="disabled?'jeecg-form-container-disabled':''"> <div :class="disabled?'jero-form-container-disabled':''">
<fieldset :disabled="disabled"> <fieldset :disabled="disabled">
<slot name="detail"></slot> <slot name="detail"></slot>
</fieldset> </fieldset>
@@ -32,7 +32,7 @@ import '@toast-ui/editor/dist/i18n/zh-cn';
import Editor from '@toast-ui/editor'; import Editor from '@toast-ui/editor';
import defaultOptions from './default-options' import defaultOptions from './default-options'
import JUpload from '@/components/jeecg/JUpload' import JUpload from '@/components/jero/JUpload'
import { getFileAccessHttpUrl } from '@/api/manage' import { getFileAccessHttpUrl } from '@/api/manage'
export default { export default {
@@ -220,11 +220,11 @@
import moment from 'moment' import moment from 'moment'
import * as utils from '@/utils/util' import * as utils from '@/utils/util'
import { mixinDevice } from '@/utils/mixin' import { mixinDevice } from '@/utils/mixin'
import JDate from '@/components/jeecg/JDate.vue' import JDate from '@/components/jero/JDate.vue'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart' import JSelectDepart from '@/components/jerobiz/JSelectDepart'
import JSelectMultiUser from '@/components/jeecgbiz/JSelectMultiUser' import JSelectMultiUser from '@/components/jerobiz/JSelectMultiUser'
import JMultiSelectTag from '@/components/dict/JMultiSelectTag' import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
import JAreaLinkage from '@comp/jeecg/JAreaLinkage' import JAreaLinkage from '@comp/jero/JAreaLinkage'
export default { export default {
name: 'JSuperQuery', name: 'JSuperQuery',
@@ -1,6 +1,6 @@
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import PropTypes from 'ant-design-vue/es/_util/vue-types' import PropTypes from 'ant-design-vue/es/_util/vue-types'
import { JVXETypes } from '@/components/jeecg/JVxeTable/jvxeTypes' import { JVXETypes } from '@/components/jero/JVxeTable/jvxeTypes'
import VxeWebSocketMixins from '../mixins/vxe.web.socket.mixins' import VxeWebSocketMixins from '../mixins/vxe.web.socket.mixins'
import { initDictOptions } from '@/components/dict/JDictSelectUtil' import { initDictOptions } from '@/components/dict/JDictSelectUtil'
@@ -11,7 +11,7 @@
<script> <script>
import { neverNull } from '@/utils/util' import { neverNull } from '@/utils/util'
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
export default { export default {
name: 'JVxeCheckboxCell', name: 'JVxeCheckboxCell',
@@ -14,8 +14,8 @@
<script> <script>
import moment from 'moment' import moment from 'moment'
import { JVXETypes } from '@/components/jeecg/JVxeTable/index' import { JVXETypes } from '@/components/jero/JVxeTable/index'
import JVxeCellMixins, { dispatchEvent } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins, { dispatchEvent } from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
export default { export default {
name: 'JVxeDateCell', name: 'JVxeDateCell',
@@ -26,8 +26,8 @@
</template> </template>
<script> <script>
import JVxeCellMixins, { dispatchEvent } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins, { dispatchEvent } from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
import JSelectDepartModal from '@/components/jeecgbiz/modal/JSelectDepartModal' import JSelectDepartModal from '@/components/jerobiz/modal/JSelectDepartModal'
export default { export default {
name: 'JVxeDepartSelectCell', name: 'JVxeDepartSelectCell',
@@ -20,7 +20,7 @@
</template> </template>
<script> <script>
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
export default { export default {
name: 'JVxeDragSortCell', name: 'JVxeDragSortCell',
@@ -9,8 +9,8 @@
</template> </template>
<script> <script>
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
const NumberRegExp = /^-?\d+\.?\d*$/ const NumberRegExp = /^-?\d+\.?\d*$/
export default { export default {
@@ -8,7 +8,7 @@
<script> <script>
import ReloadEffect from './ReloadEffect' import ReloadEffect from './ReloadEffect'
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
export default { export default {
name: 'JVxeNormalCell', name: 'JVxeNormalCell',
@@ -8,7 +8,7 @@
</template> </template>
<script> <script>
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
// JVxe 进度条组件 // JVxe 进度条组件
export default { export default {
@@ -21,8 +21,8 @@
</template> </template>
<script> <script>
import JVxeCellMixins, { dispatchEvent } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins, { dispatchEvent } from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
import { JVXETypes } from '@comp/jeecg/JVxeTable/index' import { JVXETypes } from '@comp/jero/JVxeTable/index'
export default { export default {
name: 'JVxeSelectCell', name: 'JVxeSelectCell',
@@ -1,4 +1,4 @@
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
// 插槽 // 插槽
export default { export default {
@@ -1,4 +1,4 @@
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
// tags 组件的显示组件 // tags 组件的显示组件
export const TagsSpanCell = { export const TagsSpanCell = {
@@ -10,8 +10,8 @@
</template> </template>
<script> <script>
import JInputPop from '@/components/jeecg/minipop/JInputPop' import JInputPop from '@/components/jero/minipop/JInputPop'
import JVxeCellMixins, { dispatchEvent } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins, { dispatchEvent } from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
export default { export default {
name: 'JVxeTextareaCell', name: 'JVxeTextareaCell',
@@ -61,7 +61,7 @@
</template> </template>
<script> <script>
import JVxeCellMixins from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
import { getFileAccessHttpUrl } from '@api/manage' import { getFileAccessHttpUrl } from '@api/manage'
@@ -31,8 +31,8 @@
</template> </template>
<script> <script>
import JVxeCellMixins, { dispatchEvent } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins' import JVxeCellMixins, { dispatchEvent } from '@/components/jero/JVxeTable/mixins/JVxeCellMixins'
import JSelectUserByDepModal from '@/components/jeecgbiz/modal/JSelectUserByDepModal' import JSelectUserByDepModal from '@/components/jerobiz/modal/JSelectUserByDepModal'
export default { export default {
name: 'JVxeUserSelectCell', name: 'JVxeUserSelectCell',
@@ -8,7 +8,7 @@ import VXETable, { Grid } from 'vxe-table'
import VXETablePluginAntd from 'vxe-table-plugin-antd' import VXETablePluginAntd from 'vxe-table-plugin-antd'
import 'vxe-table/lib/index.css' import 'vxe-table/lib/index.css'
import 'vxe-table-plugin-antd/dist/style.css' import 'vxe-table-plugin-antd/dist/style.css'
import { getEnhancedMixins, installAllCell, installOneCell } from '@/components/jeecg/JVxeTable/utils/cellUtils' import { getEnhancedMixins, installAllCell, installOneCell } from '@/components/jero/JVxeTable/utils/cellUtils'
// VxeGrid所有的方法映射 // VxeGrid所有的方法映射
const VxeGridMethodsMap = {} const VxeGridMethodsMap = {}
@@ -1,6 +1,6 @@
import PropTypes from 'ant-design-vue/es/_util/vue-types' import PropTypes from 'ant-design-vue/es/_util/vue-types'
import { filterDictText } from '@/components/dict/JDictSelectUtil' import { filterDictText } from '@/components/dict/JDictSelectUtil'
import { getEnhancedMixins, JVXERenderType, replaceProps } from '@/components/jeecg/JVxeTable/utils/cellUtils' import { getEnhancedMixins, JVXERenderType, replaceProps } from '@/components/jero/JVxeTable/utils/cellUtils'
// noinspection JSUnusedLocalSymbols // noinspection JSUnusedLocalSymbols
export default { export default {
@@ -1,4 +1,4 @@
import { AllCells, JVXETypes } from '@/components/jeecg/JVxeTable' import { AllCells, JVXETypes } from '@/components/jero/JVxeTable'
import JVxeCellMixins from '../mixins/JVxeCellMixins' import JVxeCellMixins from '../mixins/JVxeCellMixins'
export const JVXERenderType = { export const JVXERenderType = {
@@ -1,5 +1,5 @@
import { getVmParentByName } from '@/utils/util' import { getVmParentByName } from '@/utils/util'
import { JVXETypes } from '@comp/jeecg/JVxeTable/index' import { JVXETypes } from '@comp/jero/JVxeTable/index'
export const VALIDATE_FAILED = Symbol() export const VALIDATE_FAILED = Symbol()
@@ -46,7 +46,7 @@
script内需引入jdate script内需引入jdate
```vue ```vue
<script> <script>
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jero/JDate'
export default { export default {
name: "demo", name: "demo",
components: { components: {
@@ -222,7 +222,7 @@ this.$refs.superQueryModal.show();
## 引入组件 ## 引入组件
```js ```js
import JTreeTable from '@/components/jeecg/JTreeTable' import JTreeTable from '@/components/jero/JTreeTable'
export default { export default {
components: { JTreeTable } components: { JTreeTable }
} }
@@ -251,7 +251,7 @@ export default {
</template> </template>
<script> <script>
import JTreeTable from '@/components/jeecg/JTreeTable' import JTreeTable from '@/components/jero/JTreeTable'
export default { export default {
name: 'AsyncTreeTable', name: 'AsyncTreeTable',
@@ -308,7 +308,7 @@ export default {
</template> </template>
<script> <script>
import JCheckbox from '@/components/jeecg/JCheckbox' import JCheckbox from '@/components/jero/JCheckbox'
export default { export default {
components: {JCheckbox}, components: {JCheckbox},
data() { data() {
@@ -364,7 +364,7 @@ export default {
</template> </template>
<script> <script>
import JCodeEditor from '@/components/jeecg/JCodeEditor' import JCodeEditor from '@/components/jero/JCodeEditor'
export default { export default {
components: {JCodeEditor}, components: {JCodeEditor},
data() { data() {
@@ -409,7 +409,7 @@ export default {
</template> </template>
<script> <script>
import JCodeEditor from '@/components/jeecg/JCodeEditor' import JCodeEditor from '@/components/jero/JCodeEditor'
export default { export default {
components: {JCodeEditor}, components: {JCodeEditor},
data() { data() {
@@ -448,7 +448,7 @@ online用 实际开发请使用components/dict/JMultiSelectTag
</template> </template>
<script> <script>
import JSlider from '@/components/jeecg/JSlider' import JSlider from '@/components/jero/JSlider'
export default { export default {
components: {JSlider}, components: {JSlider},
data() { data() {
@@ -497,7 +497,7 @@ online用 实际开发请使用components/dict/JMultiSelectTag
</template> </template>
<script> <script>
import JTreeSelect from '@/components/jeecg/JTreeSelect' import JTreeSelect from '@/components/jero/JTreeSelect'
export default { export default {
components: {JTreeSelect}, components: {JTreeSelect},
data() { data() {
@@ -487,7 +487,7 @@ this.$refs.editableTable.getValues((error, values) => {
</template> </template>
<script> <script>
import { FormTypes } from '@/utils/JEditableTableUtil' import { FormTypes } from '@/utils/JEditableTableUtil'
import JEditableTable from '@/components/jeecg/JEditableTable' import JEditableTable from '@/components/jero/JEditableTable'
export default { export default {
components: { JEditableTable }, components: { JEditableTable },
data() { data() {
@@ -27,12 +27,12 @@ import JSwitch from './JSwitch.vue'
import JTime from './JTime.vue' import JTime from './JTime.vue'
import JTreeTable from './JTreeTable.vue' import JTreeTable from './JTreeTable.vue'
//jeecgbiz //jerobiz
import JSelectDepart from '../jeecgbiz/JSelectDepart.vue' import JSelectDepart from '../jerobiz/JSelectDepart.vue'
import JSelectMultiUser from '../jeecgbiz/JSelectMultiUser.vue' import JSelectMultiUser from '../jerobiz/JSelectMultiUser.vue'
import JSelectPosition from '../jeecgbiz/JSelectPosition.vue' import JSelectPosition from '../jerobiz/JSelectPosition.vue'
import JSelectRole from '../jeecgbiz/JSelectRole.vue' import JSelectRole from '../jerobiz/JSelectRole.vue'
import JSelectUserByDep from '../jeecgbiz/JSelectUserByDep.vue' import JSelectUserByDep from '../jerobiz/JSelectUserByDep.vue'
export default { export default {
install(Vue) { install(Vue) {
@@ -65,7 +65,7 @@ export default {
Vue.component('JTreeTable', JTreeTable) Vue.component('JTreeTable', JTreeTable)
Vue.component('JUpload', JUpload) Vue.component('JUpload', JUpload)
//jeecgbiz //jerobiz
Vue.component('JSelectDepart', JSelectDepart) Vue.component('JSelectDepart', JSelectDepart)
Vue.component('JSelectMultiUser', JSelectMultiUser) Vue.component('JSelectMultiUser', JSelectMultiUser)
Vue.component('JSelectPosition', JSelectPosition) Vue.component('JSelectPosition', JSelectPosition)
@@ -5,7 +5,7 @@ Jeecg 选择组件的公共可复用组件
## 引用方式 ## 引用方式
```js ```js
import JSelectBizComponent from '@/src/components/jeecgbiz/JSelectBizComponent' import JSelectBizComponent from '@/src/components/jerobiz/JSelectBizComponent'
export default { export default {
components: { JSelectBizComponent } components: { JSelectBizComponent }
@@ -11,7 +11,7 @@
</template> </template>
<script> <script>
import JDate from '@comp/jeecg/JDate' import JDate from '@comp/jero/JDate'
import JSelectBizComponent from './JSelectBizComponent' import JSelectBizComponent from './JSelectBizComponent'
export default { export default {
@@ -33,7 +33,7 @@
</template> </template>
<script> <script>
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart' import JSelectDepart from '@/components/jerobiz/JSelectDepart'
export default { export default {
components: {JSelectDepart}, components: {JSelectDepart},
data() { data() {
@@ -72,7 +72,7 @@
</template> </template>
<script> <script>
import JSelectMultiUser from '@/components/jeecgbiz/JSelectMultiUser' import JSelectMultiUser from '@/components/jerobiz/JSelectMultiUser'
export default { export default {
components: {JSelectMultiUser}, components: {JSelectMultiUser},
data() { data() {
@@ -117,7 +117,7 @@
</template> </template>
<script> <script>
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' import JSelectUserByDep from '@/components/jerobiz/JSelectUserByDep'
export default { export default {
components: {JSelectUserByDep}, components: {JSelectUserByDep},
data() { data() {
+1 -1
View File
@@ -121,4 +121,4 @@ Vue.prototype.$success = Modal.success
Vue.prototype.$error = Modal.error Vue.prototype.$error = Modal.error
Vue.prototype.$warning = Modal.warning Vue.prototype.$warning = Modal.warning
process.env.NODE_ENV !== 'production' && console.warn('[jeecg-boot-vue] NOTICE: Antd use lazy-load.') process.env.NODE_ENV !== 'production' && console.warn('[jero-boot-vue] NOTICE: Antd use lazy-load.')
+2 -2
View File
@@ -42,10 +42,10 @@ import config from '@/defaultSettings'
import JDictSelectTag from './components/dict/index.js' import JDictSelectTag from './components/dict/index.js'
import hasPermission from '@/utils/hasPermission' import hasPermission from '@/utils/hasPermission'
import vueBus from '@/utils/vueBus'; import vueBus from '@/utils/vueBus';
import JeecgComponents from '@/components/jeecg/index' import JeecgComponents from '@/components/jero/index'
import '@/assets/less/JAreaLinkage.less' import '@/assets/less/JAreaLinkage.less'
import VueAreaLinkage from 'vue-area-linkage' import VueAreaLinkage from 'vue-area-linkage'
import '@/components/jeecg/JVxeTable/install' import '@/components/jero/JVxeTable/install'
import '@/components/JVxeCells/install' import '@/components/JVxeCells/install'
Vue.config.productionTip = false Vue.config.productionTip = false
+1 -1
View File
@@ -1,4 +1,4 @@
import JEditableTable from '@/components/jeecg/JEditableTable' import JEditableTable from '@/components/jero/JEditableTable'
import { VALIDATE_NO_PASSED, getRefPromise, validateFormAndTables } from '@/utils/JEditableTableUtil' import { VALIDATE_NO_PASSED, getRefPromise, validateFormAndTables } from '@/utils/JEditableTableUtil'
import { httpAction, getAction } from '@/api/manage' import { httpAction, getAction } from '@/api/manage'
+1 -1
View File
@@ -1,4 +1,4 @@
import { VALIDATE_FAILED, getRefPromise, validateFormAndTables} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js' import { VALIDATE_FAILED, getRefPromise, validateFormAndTables} from '@/components/jero/JVxeTable/utils/vxeUtils.js'
import { httpAction, getAction } from '@/api/manage' import { httpAction, getAction } from '@/api/manage'
export const JVxeTableMixin = { export const JVxeTableMixin = {
+2 -2
View File
@@ -7,7 +7,7 @@ import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
/** /**
* 【指定 axios的 baseURL】 * 【指定 axios的 baseURL】
* 如果手工指定 baseURL: '/jeecg-boot' * 如果手工指定 baseURL: '/jero-boot'
* 则映射后端域名,通过 vue.config.js * 则映射后端域名,通过 vue.config.js
* @type {*|string} * @type {*|string}
*/ */
@@ -15,7 +15,7 @@ let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
//console.log("apiBaseUrl= ",apiBaseUrl) //console.log("apiBaseUrl= ",apiBaseUrl)
// 创建 axios 实例 // 创建 axios 实例
const service = axios.create({ const service = axios.create({
//baseURL: '/jeecg-boot', //baseURL: '/jero-boot',
baseURL: apiBaseUrl, // api base_url baseURL: apiBaseUrl, // api base_url
timeout: 9000 // 请求超时时间 timeout: 9000 // 请求超时时间
}) })
+1 -1
View File
@@ -140,7 +140,7 @@
<script> <script>
import noDataPng from '@/assets/nodata.png' import noDataPng from '@/assets/nodata.png'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jero/JEllipsis'
const tempSs1=[{ const tempSs1=[{
id:"001", id:"001",
@@ -38,7 +38,7 @@
<script> <script>
import moment from 'moment' import moment from 'moment'
import { pushIfNotExist, randomNumber, randomUUID } from '@/utils/util' import { pushIfNotExist, randomNumber, randomUUID } from '@/utils/util'
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
export default { export default {
name: 'JVxeDemo1', name: 'JVxeDemo1',
@@ -24,7 +24,7 @@
<script> <script>
import moment from 'moment' import moment from 'moment'
import { randomNumber, randomUUID } from '@/utils/util' import { randomNumber, randomUUID } from '@/utils/util'
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
export default { export default {
name: 'JVxeDemo2', name: 'JVxeDemo2',
@@ -32,7 +32,7 @@
<script> <script>
import { getAction, postAction, putAction } from '@api/manage' import { getAction, postAction, putAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
// 即时保存示例 // 即时保存示例
export default { export default {
@@ -119,7 +119,7 @@
<script> <script>
import { getAction } from '@api/manage' import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
// 弹出子表示例 // 弹出子表示例
export default { export default {
@@ -36,7 +36,7 @@
<script> <script>
import { getAction } from '@api/manage' import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
// 无痕刷新示例 // 无痕刷新示例
export default { export default {
@@ -52,7 +52,7 @@
</template> </template>
<script> <script>
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
import { getAction } from '@api/manage' import { getAction } from '@api/manage'
export default { export default {
@@ -61,7 +61,7 @@
<script> <script>
import { getAction } from '@api/manage' import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
// 【多种布局模板】上面父、左下子、右下孙 // 【多种布局模板】上面父、左下子、右下孙
export default { export default {
@@ -54,7 +54,7 @@
<script> <script>
import { getAction } from '@api/manage' import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
// 【多种布局模板】 左边选择后,记录选到右侧,右侧是父、子 // 【多种布局模板】 左边选择后,记录选到右侧,右侧是父、子
export default { export default {
@@ -53,7 +53,7 @@
<script> <script>
import { getAction } from '@api/manage' import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
// 【多种布局模板】左侧上边是主表、下边是子表,右侧是选中数据 // 【多种布局模板】左侧上边是主表、下边是子表,右侧是选中数据
export default { export default {
@@ -72,7 +72,7 @@
<script> <script>
import { getAction } from '@api/manage' import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable' import { JVXETypes } from '@/components/jero/JVxeTable'
export default { export default {
name: 'Template4', name: 'Template4',

Some files were not shown because too many files have changed in this diff Show More