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

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 -1
View File
@@ -140,7 +140,7 @@
<script>
import noDataPng from '@/assets/nodata.png'
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
const tempSs1=[{
id:"001",
@@ -38,7 +38,7 @@
<script>
import moment from 'moment'
import { pushIfNotExist, randomNumber, randomUUID } from '@/utils/util'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
export default {
name: 'JVxeDemo1',
@@ -24,7 +24,7 @@
<script>
import moment from 'moment'
import { randomNumber, randomUUID } from '@/utils/util'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
export default {
name: 'JVxeDemo2',
@@ -32,7 +32,7 @@
<script>
import { getAction, postAction, putAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
// 即时保存示例
export default {
@@ -119,7 +119,7 @@
<script>
import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
// 弹出子表示例
export default {
@@ -36,7 +36,7 @@
<script>
import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
// 无痕刷新示例
export default {
@@ -52,7 +52,7 @@
</template>
<script>
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
import { getAction } from '@api/manage'
export default {
@@ -61,7 +61,7 @@
<script>
import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
// 【多种布局模板】上面父、左下子、右下孙
export default {
@@ -54,7 +54,7 @@
<script>
import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
// 【多种布局模板】 左边选择后,记录选到右侧,右侧是父、子
export default {
@@ -53,7 +53,7 @@
<script>
import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
// 【多种布局模板】左侧上边是主表、下边是子表,右侧是选中数据
export default {
@@ -72,7 +72,7 @@
<script>
import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
export default {
name: 'Template4',
@@ -38,7 +38,7 @@
<script>
import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
import { JVXETypes } from '@/components/jero/JVxeTable'
// 【多种布局模板】左侧为树,右侧为行编辑
export default {
+3 -3
View File
@@ -161,8 +161,8 @@
<script>
import JeecgDemoModal from './modules/JeecgDemoModal'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue';
import JInput from '@/components/jeecg/JInput.vue';
import JSuperQuery from '@/components/jero/JSuperQuery.vue';
import JInput from '@/components/jero/JInput.vue';
import JeecgDemoTabsModal from './modules/JeecgDemoTabsModal'
import {initDictOptions, filterDictText,filterDictTextByCache} from '@/components/dict/JDictSelectUtil'
import { JeroListMixin } from '@/mixins/JeroListMixin'
@@ -310,7 +310,7 @@
},
//跳转单据页面
jump() {
this.$router.push({path: '/jeecg/helloworld'})
this.$router.push({path: '/jero/helloworld'})
},
onBirthdayChange: function (value, dateString) {
console.log(dateString[0],dateString[1]);
+1 -1
View File
@@ -20,7 +20,7 @@
</template>
<script>
import JTreeTable from '@/components/jeecg/JTreeTable'
import JTreeTable from '@/components/jero/JTreeTable'
export default {
name: 'JeecgTreeTable',
+23 -23
View File
@@ -435,29 +435,29 @@
<script>
import JDictSelectTag from '../../components/dict/JDictSelectTag.vue'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JSelectMultiUser from '@/components/jeecgbiz/JSelectMultiUser'
import JSelectRole from '@/components/jeecgbiz/JSelectRole'
import JCheckbox from '@/components/jeecg/JCheckbox'
import JCodeEditor from '@/components/jeecg/JCodeEditor'
import JDate from '@/components/jeecg/JDate'
import JEditor from '@/components/jeecg/JEditor'
import JEllipsis from '@/components/jeecg/JEllipsis'
import JSlider from '@/components/jeecg/JSlider'
import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
import JTreeDict from "../../components/jeecg/JTreeDict.vue";
import JCron from "@/components/jeecg/JCron.vue";
import JTreeSelect from '@/components/jeecg/JTreeSelect'
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JUpload from '@/components/jeecg/JUpload'
import JImageUpload from '@/components/jeecg/JImageUpload'
import JSelectPosition from '@comp/jeecgbiz/JSelectPosition'
import JCategorySelect from '@comp/jeecg/JCategorySelect'
import JSelectDepart from '@/components/jerobiz/JSelectDepart'
import JSelectUserByDep from '@/components/jerobiz/JSelectUserByDep'
import JSelectMultiUser from '@/components/jerobiz/JSelectMultiUser'
import JSelectRole from '@/components/jerobiz/JSelectRole'
import JCheckbox from '@/components/jero/JCheckbox'
import JCodeEditor from '@/components/jero/JCodeEditor'
import JDate from '@/components/jero/JDate'
import JEditor from '@/components/jero/JEditor'
import JEllipsis from '@/components/jero/JEllipsis'
import JSlider from '@/components/jero/JSlider'
import JSelectMultiple from '@/components/jero/JSelectMultiple'
import JTreeDict from "../../components/jero/JTreeDict.vue";
import JCron from "@/components/jero/JCron.vue";
import JTreeSelect from '@/components/jero/JTreeSelect'
import JSuperQuery from '@/components/jero/JSuperQuery'
import JUpload from '@/components/jero/JUpload'
import JImageUpload from '@/components/jero/JImageUpload'
import JSelectPosition from '@comp/jerobiz/JSelectPosition'
import JCategorySelect from '@comp/jero/JCategorySelect'
import JMultiSelectTag from '@comp/dict/JMultiSelectTag'
import JInput from '@comp/jeecg/JInput'
import JAreaLinkage from '@comp/jeecg/JAreaLinkage'
import JMarkdownEditor from '@/components/jeecg/JMarkdownEditor/index'
import JInput from '@comp/jero/JInput'
import JAreaLinkage from '@comp/jero/JAreaLinkage'
import JMarkdownEditor from '@/components/jero/JMarkdownEditor/index'
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
export default {
@@ -496,7 +496,7 @@
departId: '57197590443c44f083d42ae24ef26a2c,a7d7e77e06c84325a40932163adcdaa6',
orgCodes: 'A02A01,A02A02',
userIds: 'admin',
multiUser: 'admin,jeecg',
multiUser: 'admin,jero',
jcheckbox: {
values: 'spring,jeecgboot',
options: [
@@ -37,7 +37,7 @@
import moment from 'moment'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { randomUUID, randomNumber } from '@/utils/util'
import JEditableTable from '@/components/jeecg/JEditableTable'
import JEditableTable from '@/components/jero/JEditableTable'
export default {
name: 'DefaultTable',
@@ -11,7 +11,7 @@
<script>
import { FormTypes } from '@/utils/JEditableTableUtil'
import JEditableTable from '@/components/jeecg/JEditableTable'
import JEditableTable from '@/components/jero/JEditableTable'
export default {
name: 'ReadOnlyTable',
@@ -12,7 +12,7 @@
<script>
import { FormTypes } from '@/utils/JEditableTableUtil'
import JEditableTable from '@/components/jeecg/JEditableTable'
import JEditableTable from '@/components/jero/JEditableTable'
export default {
name: 'ThreeLinkage',
@@ -150,7 +150,7 @@
<script>
import { httpAction,getAction } from '@/api/manage'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jero/JDate'
import pick from 'lodash.pick'
import moment from "moment"
@@ -99,10 +99,10 @@
<script>
import JEditableTable from '@/components/jeecg/JEditableTable'
import JEditableTable from '@/components/jero/JEditableTable'
import { FormTypes, VALIDATE_NO_PASSED, getRefPromise, validateFormAndTables } from '@/utils/JEditableTableUtil'
import { httpAction, getAction } from '@/api/manage'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jero/JDate'
import pick from 'lodash.pick'
import moment from 'moment'
@@ -71,7 +71,7 @@
import pick from 'lodash.pick'
import Vue from 'vue'
import {ACCESS_TOKEN} from "@/store/mutation-types"
import JImageUpload from '../../../../components/jeecg/JImageUpload'
import JImageUpload from '../../../../components/jero/JImageUpload'
export default {
name: "JeecgOrderCustomerModal",
@@ -54,7 +54,7 @@
<script>
import {httpAction} from '@/api/manage'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jero/JDate'
import pick from 'lodash.pick'
import moment from "moment"
@@ -63,7 +63,7 @@
import {httpAction} from '@/api/manage'
import pick from 'lodash.pick'
import moment from 'moment'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jero/JDate'
export default {
components: {
@@ -113,7 +113,7 @@
<script>
import SysMessageModal from './modules/SysMessageModal'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
import JEllipsis from "@/components/jero/JEllipsis";
export default {
name: "SysMessageList",
@@ -124,7 +124,7 @@
import SysMessageTemplateModal from './modules/SysMessageTemplateModal'
import SysMessageTestModal from './modules/SysMessageTestModal'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
import JEllipsis from "@/components/jero/JEllipsis";
export default {
name: "SysMessageTemplateList",
@@ -84,7 +84,7 @@
import {httpAction} from '@/api/manage'
import pick from 'lodash.pick'
import { duplicateCheck } from '@/api/api'
import JEditor from '@/components/jeecg/JEditor'
import JEditor from '@/components/jero/JEditor'
export default {
name: "SysMessageTemplateModal",
+1 -1
View File
@@ -62,7 +62,7 @@
<script>
import DataLogModal from './modules/DataLogModal'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
import JEllipsis from "@/components/jero/JEllipsis";
export default {
name: 'DataLogList',
+1 -1
View File
@@ -121,7 +121,7 @@
},
data() {
return {
description: 'jeecg 生成SysDepart代码管理页面',
description: 'jero 生成SysDepart代码管理页面',
// 查询条件
queryParam: {},
//数据集
+1 -1
View File
@@ -75,7 +75,7 @@
<script>
import { filterObj } from '@/utils/util';
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
export default {
name: "LogList",
@@ -84,7 +84,7 @@
import { getSystemMenuList, getSystemSubmenu, getSystemSubmenuBatch } from '@/api/api'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import PermissionDataRuleList from './PermissionDataRuleList'
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
const columns = [
{
+1 -1
View File
@@ -84,7 +84,7 @@
import { getPermissionList } from '@/api/api'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import PermissionDataRuleList from './PermissionDataRuleList'
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
const columns = [
{
+1 -1
View File
@@ -112,7 +112,7 @@
import QuartzJobModal from './modules/QuartzJobModal'
import { getAction } from '@/api/manage'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
import JEllipsis from "@/components/jero/JEllipsis";
export default {
name: "QuartzJobList",
+1 -1
View File
@@ -101,7 +101,7 @@
import RoleModal from './modules/RoleModal'
import UserRoleModal from './modules/UserRoleModal'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jero/JDate'
export default {
name: "RoleList",
@@ -108,7 +108,7 @@
</template>
<script>
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import SysCheckRuleModal from './modules/SysCheckRuleModal'
import SysCheckRuleTestModal from './modules/SysCheckRuleTestModal'
@@ -100,7 +100,7 @@
</template>
<script>
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import SysDataSourceModal from './modules/SysDataSourceModal'
+2 -2
View File
@@ -179,9 +179,9 @@
import {putAction,getFileAccessHttpUrl} from '@/api/manage';
import {frozenBatch} from '@/api/api'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import JInput from '@/components/jeecg/JInput'
import JInput from '@/components/jero/JInput'
import UserRecycleBinModal from './modules/UserRecycleBinModal'
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JSuperQuery from '@/components/jero/JSuperQuery'
export default {
name: "UserList",
@@ -50,7 +50,7 @@
<script>
import {httpAction, getAction} from '@/api/manage'
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
import {initDictOptions} from '@/components/dict/JDictSelectUtil'
export default {
@@ -56,7 +56,7 @@
<script>
import { httpAction } from '@/api/manage'
import JCron from "@/components/jeecg/JCron";
import JCron from "@/components/jero/JCron";
import pick from 'lodash.pick'
// import moment from "moment"
@@ -138,8 +138,8 @@
import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
import { getAction } from '@/api/manage'
import JDate from '@/components/jeecg/JDate'
import JEditor from '@/components/jeecg/JEditor'
import JDate from '@/components/jero/JDate'
import JEditor from '@/components/jero/JEditor'
import SelectUserListModal from "./SelectUserListModal";
import moment from 'moment'
@@ -21,11 +21,11 @@
pidValue="0">
</j-tree-select>
</a-form-item>
<a-form-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="[ 'name', validatorRules.name]" placeholder="请输入分类名称"></a-input>
</a-form-item>
<!--<a-form-item label="类型编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="[ 'code', validatorRules.code]" placeholder="请输入类型编码"></a-input>
</a-form-item>-->
@@ -36,8 +36,8 @@
编码值前缀需和父节点保持一致,比如父级节点编码是A01则当前编码必须以A01开头
</span>
</a-form-item>-->
</a-form>
</a-spin>
</a-modal>
@@ -47,11 +47,11 @@
import { httpAction,getAction } from '@/api/manage'
import pick from 'lodash.pick'
import JTreeSelect from '@/components/jeecg/JTreeSelect'
import JTreeSelect from '@/components/jero/JTreeSelect'
export default {
name: "SysCategoryModal",
components: {
components: {
JTreeSelect
},
data () {
@@ -90,7 +90,7 @@
expandedRowKeys:[],
pidField:"pid",
subExpandedKeys:[]
}
},
created () {
@@ -140,7 +140,7 @@
that.close();
})
}
})
},
handleCancel () {
@@ -187,8 +187,8 @@
}
})
},
}
}
</script>
@@ -82,7 +82,7 @@
import { httpAction } from '@/api/manage'
import { validateDuplicateValue, alwaysResolve, failedSymbol } from '@/utils/util'
import { FormTypes } from '@/utils/JEditableTableUtil'
import JEditableTable from '@comp/jeecg/JEditableTable'
import JEditableTable from '@comp/jero/JEditableTable'
export default {
name: 'SysCheckRuleModal',
@@ -146,17 +146,17 @@
},
dbUrlMap: {
// MySQL 数据库
'1': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false' },
'1': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false' },
//MySQL5.7+ 数据库
'4': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai' },
'4': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai' },
// Oracle
'2': { dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:ORCL' },
// SQLServer 数据库
'3': { dbUrl: 'jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=jeecgboot' },
// SQLServer 数据库
'5': { dbUrl: 'jdbc:mariadb://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useSSL=false' },
'5': { dbUrl: 'jdbc:mariadb://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useSSL=false' },
// SQLServer 数据库
'6': { dbUrl: 'jdbc:postgresql://127.0.0.1:5432/jeecg-boot' }
'6': { dbUrl: 'jdbc:postgresql://127.0.0.1:5432/jero-boot' }
}
}
},
@@ -68,8 +68,8 @@
<script>
import pick from 'lodash.pick'
import { httpAction, getAction } from '@/api/manage'
import JDate from '@/components/jeecg/JDate.vue';
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDate from '@/components/jero/JDate.vue';
import JSelectUserByDep from '@/components/jerobiz/JSelectUserByDep'
export default {
name: "SysUserAgentModal",
@@ -47,8 +47,8 @@
import { httpAction, getAction } from '@/api/manage'
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JFormContainer from '@/components/jero/JFormContainer'
import JDate from '@/components/jero/JDate'
import JDictSelectTag from "@/components/dict/JDictSelectTag"
export default {
@@ -168,13 +168,13 @@
import Vue from 'vue'
// 引入搜索部门弹出框的组件
import departWindow from './DepartWindow'
import JSelectPosition from '@/components/jeecgbiz/JSelectPosition'
import JSelectPosition from '@/components/jerobiz/JSelectPosition'
import { ACCESS_TOKEN } from "@/store/mutation-types"
import { getAction } from '@/api/manage'
import {addUser,editUser,queryUserRole,queryall } from '@/api/api'
import { disabledAuthFilter } from "@/utils/authFilter"
import {duplicateCheck } from '@/api/api'
import JImageUpload from '../../../components/jeecg/JImageUpload'
import JImageUpload from '../../../components/jero/JImageUpload'
export default {
name: "UserModal",