Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
嫣夜来
jeecg-boot
提交
9c6f68fd
J
jeecg-boot
项目概览
嫣夜来
/
jeecg-boot
与 Fork 源项目一致
Fork自
jeecg / jeecg-boot
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jeecg-boot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9c6f68fd
编写于
10月 19, 2019
作者:
JEECG低代码平台
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
JeecgBoot 2.1.1 版本发布
上级
fd57f233
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
36 addition
and
18 deletion
+36
-18
ant-design-vue-jeecg/package.json
ant-design-vue-jeecg/package.json
+1
-1
ant-design-vue-jeecg/src/components/dict/JDictSelectTag.vue
ant-design-vue-jeecg/src/components/dict/JDictSelectTag.vue
+10
-2
ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue
ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue
+17
-6
ant-design-vue-jeecg/src/router/index.js
ant-design-vue-jeecg/src/router/index.js
+5
-0
ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformCopyList.vue
...ecg/src/views/modules/online/cgform/OnlCgformCopyList.vue
+0
-1
ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformHeadList.vue
...ecg/src/views/modules/online/cgform/OnlCgformHeadList.vue
+1
-2
ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue
...rc/views/modules/online/cgform/auto/OnlCgformAutoList.vue
+1
-1
ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue
...rc/views/modules/online/cgform/auto/OnlCgformTreeList.vue
+1
-1
jeecg-boot/.gitattributes
jeecg-boot/.gitattributes
+0
-0
jeecg-boot/jeecg-boot-module-system/.gitattributes
jeecg-boot/jeecg-boot-module-system/.gitattributes
+0
-4
未找到文件。
ant-design-vue-jeecg/package.json
浏览文件 @
9c6f68fd
...
...
@@ -10,7 +10,7 @@
},
"dependencies"
:
{
"@antv/data-set"
:
"^0.10.2"
,
"@jeecg/antd-online"
:
"
^
1.2.0"
,
"@jeecg/antd-online"
:
"1.2.0"
,
"@tinymce/tinymce-vue"
:
"^2.0.0"
,
"ant-design-vue"
:
"^1.4.0"
,
"apexcharts"
:
"^3.6.5"
,
...
...
ant-design-vue-jeecg/src/components/dict/JDictSelectTag.vue
浏览文件 @
9c6f68fd
...
...
@@ -32,15 +32,23 @@
tagType
:
""
}
},
watch
:{
dictCode
:{
immediate
:
true
,
handler
()
{
this
.
initDictData
()
},
}
},
created
()
{
console
.
log
(
this
.
dictCode
);
//
console.log(this.dictCode);
if
(
!
this
.
type
||
this
.
type
===
"
list
"
){
this
.
tagType
=
"
select
"
}
else
{
this
.
tagType
=
this
.
type
}
//获取字典数据
this
.
initDictData
();
//
this.initDictData();
},
methods
:
{
initDictData
()
{
...
...
ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue
浏览文件 @
9c6f68fd
...
...
@@ -43,7 +43,7 @@
<a-col
:span=
"8"
>
<a-select
placeholder=
"选择查询字段"
v-model=
"item.field"
@
select=
"(val,option)=>handleSelected(option,item)"
>
<a-select-option
v-for=
"(f,fIndex) in fieldList"
:key=
" 'field'+fIndex"
:value=
"f.value"
:data-
type=
"f.type
"
>
{{ f.text }}
</a-select-option>
<a-select-option
v-for=
"(f,fIndex) in fieldList"
:key=
" 'field'+fIndex"
:value=
"f.value"
:data-
idx=
"fIndex
"
>
{{ f.text }}
</a-select-option>
</a-select>
</a-col>
...
...
@@ -63,8 +63,9 @@
</a-col>
<a-col
:span=
"8"
>
<j-date
v-if=
" item.type=='date' "
v-model=
"item.val"
placeholder=
"请选择日期"
></j-date>
<j-date
v-else-if=
" item.type=='datetime' "
v-model=
"item.val"
placeholder=
"请选择时间"
:show-time=
"true"
date-format=
"YYYY-MM-DD HH:mm:ss"
></j-date>
<j-dict-select-tag
v-if=
"item.dictCode"
v-model=
"item.val"
:dictCode=
"item.dictCode"
placeholder=
"请选择"
/>
<j-date
v-else-if=
" item.type=='date' "
v-model=
"item.val"
placeholder=
"请选择日期"
style=
"width: 100%"
></j-date>
<j-date
v-else-if=
" item.type=='datetime' "
v-model=
"item.val"
placeholder=
"请选择时间"
:show-time=
"true"
date-format=
"YYYY-MM-DD HH:mm:ss"
style=
"width: 100%"
></j-date>
<a-input-number
v-else-if=
" item.type=='int'||item.type=='number' "
style=
"width: 100%"
placeholder=
"请输入数值"
v-model=
"item.val"
/>
<a-input
v-else
v-model=
"item.val"
placeholder=
"请输入值"
/>
</a-col>
...
...
@@ -117,8 +118,14 @@
name
:
'
JSuperQuery
'
,
components
:
{
JDate
},
props
:
{
/* fieldList:[{value:'',text:'',type:''}]
* type:date datetime int number string
/*
fieldList: [{
value:'',
text:'',
type:'',
dictCode:'' // 只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框
}]
type:date datetime int number string
* */
fieldList
:
{
type
:
Array
,
...
...
@@ -213,7 +220,11 @@
this
.
queryParamsModel
.
splice
(
index
,
1
)
},
handleSelected
(
option
,
item
)
{
item
[
'
type
'
]
=
option
.
data
.
attrs
[
'
data-type
'
]
let
index
=
option
.
data
.
attrs
[
'
data-idx
'
]
let
{
type
,
dictCode
}
=
this
.
fieldList
[
index
]
item
[
'
type
'
]
=
type
item
[
'
dictCode
'
]
=
dictCode
},
handleReset
()
{
this
.
queryParamsModel
=
[{}]
...
...
ant-design-vue-jeecg/src/router/index.js
浏览文件 @
9c6f68fd
...
...
@@ -2,6 +2,11 @@ import Vue from 'vue'
import
Router
from
'
vue-router
'
import
{
constantRouterMap
}
from
'
@/config/router.config
'
const
originalPush
=
Router
.
prototype
.
push
Router
.
prototype
.
push
=
function
push
(
location
)
{
return
originalPush
.
call
(
this
,
location
).
catch
(
err
=>
err
)
}
Vue
.
use
(
Router
)
export
default
new
Router
({
...
...
ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformCopyList.vue
浏览文件 @
9c6f68fd
...
...
@@ -129,7 +129,6 @@
import
Clipboard
from
'
clipboard
'
import
{
filterObj
}
from
'
@/utils/util
'
;
export
default
{
name
:
'
OnlCgformHeadList
'
,
mixins
:
[
JeecgListMixin
],
...
...
ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformHeadList.vue
浏览文件 @
9c6f68fd
...
...
@@ -177,14 +177,13 @@
import
JDictSelectTag
from
'
../../../../components/dict/JDictSelectTag.vue
'
import
{
JeecgListMixin
}
from
'
@/mixins/JeecgListMixin
'
import
Clipboard
from
'
clipboard
'
import
{
filterObj
}
from
'
@/utils/util
'
;
export
default
{
name
:
'
OnlCgformHeadList
'
,
mixins
:
[
JeecgListMixin
],
components
:
{
JDictSelectTag
,
JDictSelectTag
},
data
()
{
return
{
...
...
ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue
浏览文件 @
9c6f68fd
...
...
@@ -179,7 +179,7 @@
</span>
</a-table>
<
cgform-auto-modal
@
success=
"handleFormSuccess"
ref=
"modal"
:code=
"code"
></
cgform-auto-modal>
<
onl-cgform-auto-modal
@
success=
"handleFormSuccess"
ref=
"modal"
:code=
"code"
></onl-
cgform-auto-modal>
<j-import-modal
ref=
"importModal"
:url=
"getImportUrl()"
@
ok=
"importOk"
></j-import-modal>
...
...
ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue
浏览文件 @
9c6f68fd
...
...
@@ -128,7 +128,7 @@
</a-table>
<
cgform-auto-modal
@
success=
"handleFormSuccess"
ref=
"modal"
:code=
"code"
></
cgform-auto-modal>
<
onl-cgform-auto-modal
@
success=
"handleFormSuccess"
ref=
"modal"
:code=
"code"
></onl-
cgform-auto-modal>
<j-import-modal
ref=
"importModal"
:url=
"getImportUrl()"
@
ok=
"importOk"
></j-import-modal>
...
...
jeecg-boot/
jeecg-boot-base-common/
.gitattributes
→
jeecg-boot/.gitattributes
浏览文件 @
9c6f68fd
文件已移动
jeecg-boot/jeecg-boot-module-system/.gitattributes
已删除
100644 → 0
浏览文件 @
fd57f233
*.js linguist-language=Java
*.css linguist-language=Java
*.html linguist-language=Java
*.vue linguist-language=Java
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录