From 7402ba7c9efc4e3b97c93e7c088374a95b0f3090 Mon Sep 17 00:00:00 2001 From: newpanjing Date: Mon, 29 Apr 2019 10:05:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E2=98=80=EF=B8=8F=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 2.0.md | 9 -- HISTORY.md | 37 ----- ICON.md | 425 ----------------------------------------------------- 3 files changed, 471 deletions(-) delete mode 100644 2.0.md delete mode 100644 HISTORY.md delete mode 100644 ICON.md diff --git a/2.0.md b/2.0.md deleted file mode 100644 index 36e6e6af..00000000 --- a/2.0.md +++ /dev/null @@ -1,9 +0,0 @@ -改进与修复的问题 ----- -+ 登录页重新设计 -+ 国际化完善 - - -设置项 -+ SIMPLEUI_FAVICON='' 网页图标 -+ SIMPLEUI_LOGO='' LOGO diff --git a/HISTORY.md b/HISTORY.md deleted file mode 100644 index 48c796e9..00000000 --- a/HISTORY.md +++ /dev/null @@ -1,37 +0,0 @@ -## 更新日志 - -### version 1.4 - -+ 由于django无法自定义图标,所以采用猜测的方式来给菜单显示图标 -+ 修复select下拉框bug -+ 修复错误提示不显示bug -+ 图标使用最新版layui 2.4.4 -+ 导入jieba分词,用于猜测图标 - -## version 1.4.1 -+ 取消日志输出 - -## version 1.4.2 -+ 修复布尔类型下拉框无法显示bug - -## version 1.4.3 -+ 修正登录页面标题显示 - -## version 1.4.4 -+ 修复pip 安装失败bug - > 部分用户设置的pip,是Python2的版本,导致安装失败 -+ 去掉首页代码库标识 - -## version 1.4.5 -+ 增加自定义首页功能 -## version 1.4.6 -+ 加入 `# -*- coding: utf-8 -*-` 以支持python2 - -## version 1.4.7 -- [x] 标题页点击刷新菜单无效 -- [x] 列表页的过滤条件下拉框,如果类型为普通字段,内容不能被正确显示 -- [x] 所有的搜索,在第一页显示正常,但是在第二页的时候就丢失了搜索关键字,也就是说这个第二页就是当前页面所有数据分页之后的第二页 -- [X] 在list_filter中,不能按时间过滤(增加了时间区域选择,由于django的限制,暂时不能很好的发挥作用) - -## version 1.4.8 -- [X] 修复日期bug \ No newline at end of file diff --git a/ICON.md b/ICON.md deleted file mode 100644 index ed4c550e..00000000 --- a/ICON.md +++ /dev/null @@ -1,425 +0,0 @@ -# 图标列表 - -```python -[{ - "name": "半星", - "cls": "layui-icon-rate-half" -}, { - "name": "星星,空心", - "cls": "layui-icon-rate" -}, { - "name": "星星,实心", - "cls": "layui-icon-rate-solid" -}, { - "name": "手机,电话", - "cls": "layui-icon-cellphone" -}, { - "name": "验证码", - "cls": "layui-icon-vercode" -}, { - "name": "微信", - "cls": "layui-icon-login-wechat" -}, { - "name": "QQ", - "cls": "layui-icon-login-qq" -}, { - "name": "微博", - "cls": "layui-icon-login-weibo" -}, { - "name": "密码", - "cls": "layui-icon-password" -}, { - "name": "用户,用户名 会员 客户", - "cls": "layui-icon-username" -}, { - "name": "刷新-粗", - "cls": "layui-icon-refresh-3" -}, { - "name": "授权,权限", - "cls": "layui-icon-auz" -}, { - "name": "菜单,左向右伸缩菜单", - "cls": "layui-icon-spread-left" -}, { - "name": "右向左伸缩菜单", - "cls": "layui-icon-shrink-right" -}, { - "name": "雪花", - "cls": "layui-icon-snowflake" -}, { - "name": "提示,说明", - "cls": "layui-icon-tips" -}, { - "name": "便签,标签", - "cls": "layui-icon-note" -}, { - "name": "主页 首页 home HOME index INDEX 欢迎页 欢迎", - "cls": "layui-icon-home" -}, { - "name": "高级", - "cls": "layui-icon-senior" -}, { - "name": "刷新", - "cls": "layui-icon-refresh" -}, { - "name": "刷新", - "cls": "layui-icon-refresh-1" -}, { - "name": "旗帜,标志", - "cls": "layui-icon-flag" -}, { - "name": "主题,风格,样式", - "cls": "layui-icon-theme" -}, { - "name": "消息,通知", - "cls": "layui-icon-notice" -}, { - "name": "网站,站点", - "cls": "layui-icon-website" -}, { - "name": "控制台 仪表盘", - "cls": "layui-icon-console" -}, { - "name": "表情-惊讶", - "cls": "layui-icon-face-surprised" -}, { - "name": "设置-空心", - "cls": "layui-icon-set" -}, { - "name": "模板", - "cls": "layui-icon-template-1" -}, { - "name": "应用 APP app PC", - "cls": "layui-icon-app" -}, { - "name": "模板", - "cls": "layui-icon-template" -}, { - "name": "赞", - "cls": "layui-icon-praise" -}, { - "name": "踩", - "cls": "layui-icon-tread" -}, { - "name": "男", - "cls": "layui-icon-male" -}, { - "name": "女", - "cls": "layui-icon-female" -}, { - "name": "相机-空心", - "cls": "layui-icon-camera" -}, { - "name": "相机-实心", - "cls": "layui-icon-camera-fill" -}, { - "name": "菜单-水平", - "cls": "layui-icon-more" -}, { - "name": "菜单-垂直", - "cls": "layui-icon-more-vertical" -}, { - "name": "金额-人民币 钱 额度", - "cls": "layui-icon-rmb" -}, { - "name": "金额-美元", - "cls": "layui-icon-dollar" -}, { - "name": "钻石-等级", - "cls": "layui-icon-diamond" -}, { - "name": "火", - "cls": "layui-icon-fire" -}, { - "name": "返回", - "cls": "layui-icon-return" -}, { - "name": "位置-地图", - "cls": "layui-icon-location" -}, { - "name": "办公-阅读 文章 新闻", - "cls": "layui-icon-read" -}, { - "name": "调查 问卷", - "cls": "layui-icon-survey" -}, { - "name": "表情-微笑", - "cls": "layui-icon-face-smile" -}, { - "name": "表情-哭泣", - "cls": "layui-icon-face-cry" -}, { - "name": "购物车", - "cls": "layui-icon-cart-simple" -}, { - "name": "购物车", - "cls": "layui-icon-cart" -}, { - "name": "下一页", - "cls": "layui-icon-next" -}, { - "name": "上一页", - "cls": "layui-icon-prev" -}, { - "name": "上传-空心-拖拽", - "cls": "layui-icon-upload-drag" -}, { - "name": "上传-实心", - "cls": "layui-icon-upload" -}, { - "name": "下载-圆圈", - "cls": "layui-icon-download-circle" -}, { - "name": "组件", - "cls": "layui-icon-component" -}, { - "name": "文件-粗", - "cls": "layui-icon-file-b" -}, { - "name": "用户", - "cls": "layui-icon-user" -}, { - "name": "发现-实心", - "cls": "layui-icon-find-fill" -}, { - "name": "loading 进度", - "cls": "layui-icon-loading layui-icon layui-anim layui-anim-rotate layui-anim-loop" -}, { - "name": "loading", - "cls": "layui-icon-loading-1" -}, { - "name": "添加", - "cls": "layui-icon-add-1" -}, { - "name": "播放", - "cls": "layui-icon-play" -}, { - "name": "暂停", - "cls": "layui-icon-pause" -}, { - "name": "音频-耳机", - "cls": "layui-icon-headset" -}, { - "name": "视频 动画", - "cls": "layui-icon-video" -}, { - "name": "语音-声音", - "cls": "layui-icon-voice" -}, { - "name": "消息-通知-喇叭 公告 动态", - "cls": "layui-icon-speaker" -}, { - "name": "删除线", - "cls": "layui-icon-fonts-del" -}, { - "name": "代码 源码 源代码", - "cls": "layui-icon-fonts-code" -}, { - "name": "HTML", - "cls": "layui-icon-fonts-html" -}, { - "name": "字体加粗", - "cls": "layui-icon-fonts-strong" -}, { - "name": "删除链接", - "cls": "layui-icon-unlink" -}, { - "name": "图片", - "cls": "layui-icon-picture" -}, { - "name": "链接,友链 友情链接", - "cls": "layui-icon-link" -}, { - "name": "表情-笑-粗", - "cls": "layui-icon-face-smile-b" -}, { - "name": "左对齐", - "cls": "layui-icon-align-left" -}, { - "name": "右对齐", - "cls": "layui-icon-align-right" -}, { - "name": "居中对齐", - "cls": "layui-icon-align-center" -}, { - "name": "字体-下划线", - "cls": "layui-icon-fonts-u" -}, { - "name": "字体-斜体", - "cls": "layui-icon-fonts-i" -}, { - "name": "Tabs 选项卡", - "cls": "layui-icon-tabs" -}, { - "name": "单选框-选中", - "cls": "layui-icon-radio" -}, { - "name": "单选框-候选", - "cls": "layui-icon-circle" -}, { - "name": "编辑 修改", - "cls": "layui-icon-edit" -}, { - "name": "分享", - "cls": "layui-icon-share" -}, { - "name": "删除", - "cls": "layui-icon-delete" -}, { - "name": "表单,订单", - "cls": "layui-icon-form" -}, { - "name": "手机-细体", - "cls": "layui-icon-cellphone-fine" -}, { - "name": "聊天 对话 沟通", - "cls": "layui-icon-dialogue" -}, { - "name": "文字格式化", - "cls": "layui-icon-fonts-clear" -}, { - "name": "窗口", - "cls": "layui-icon-layer" -}, { - "name": "日期", - "cls": "layui-icon-date" -}, { - "name": "水 下雨", - "cls": "layui-icon-water" -}, { - "name": "代码-圆圈 片段", - "cls": "layui-icon-code-circle" -}, { - "name": "轮播组图", - "cls": "layui-icon-carousel" -}, { - "name": "翻页", - "cls": "layui-icon-prev-circle" -}, { - "name": "布局 页面", - "cls": "layui-icon-layouts" -}, { - "name": "工具 设置", - "cls": "layui-icon-util" -}, { - "name": "模板 导出 保存", - "cls": "layui-icon-templeate-1" -}, { - "name": "上传-圆圈", - "cls": "layui-icon-upload-circle" -}, { - "name": "树", - "cls": "layui-icon-tree" -}, { - "name": "表格", - "cls": "layui-icon-table" -}, { - "name": "图表 统计 分析 画像 报表 数据", - "cls": "layui-icon-chart" -}, { - "name": "图标 报表 屏幕", - "cls": "layui-icon-chart-screen" -}, { - "name": "引擎 系统", - "cls": "layui-icon-engine" -}, { - "name": "下三角", - "cls": "layui-icon-triangle-d" -}, { - "name": "右三角", - "cls": "layui-icon-triangle-r" -}, { - "name": "文件", - "cls": "layui-icon-file" -}, { - "name": "设置-小型", - "cls": "layui-icon-set-sm" -}, { - "name": "添加-圆圈", - "cls": "layui-icon-add-circle" -}, { - "name": "404", - "cls": "layui-icon-404" -}, { - "name": "关于", - "cls": "layui-icon-about" -}, { - "name": "箭头 向上", - "cls": "layui-icon-up" -}, { - "name": "箭头 向下", - "cls": "layui-icon-down" -}, { - "name": "箭头 向左", - "cls": "layui-icon-left" -}, { - "name": "箭头 向右", - "cls": "layui-icon-right" -}, { - "name": "圆点", - "cls": "layui-icon-circle-dot" -}, { - "name": "搜索", - "cls": "layui-icon-search" -}, { - "name": "系统", - "cls": "layui-icon-set-fill" -}, { - "name": "群组", - "cls": "layui-icon-group" -}, { - "name": "好友", - "cls": "layui-icon-friends" -}, { - "name": "回复 评论 实心", - "cls": "layui-icon-reply-fill" -}, { - "name": "菜单 隐身 实心", - "cls": "layui-icon-menu-fill" -}, { - "name": "记录 历史 最近", - "cls": "layui-icon-log" -}, { - "name": "图片-细体", - "cls": "layui-icon-picture-fine" -}, { - "name": "表情-笑-细体", - "cls": "layui-icon-face-smile-fine" -}, { - "name": "列表 目录 分类 订单 退货 退款 报损 报溢", - "cls": "layui-icon-list" -}, { - "name": "发布 纸飞机", - "cls": "layui-icon-release" -}, { - "name": "对 OK", - "cls": "layui-icon-ok" -}, { - "name": "帮助", - "cls": "layui-icon-help" -}, { - "name": "客服", - "cls": "layui-icon-chat" -}, { - "name": "top 置顶", - "cls": "layui-icon-top" -}, { - "name": "收藏-空心", - "cls": "layui-icon-star" -}, { - "name": "收藏-实心", - "cls": "layui-icon-star-fill" -}, { - "name": "关闭-实心", - "cls": "layui-icon-close-fill" -}, { - "name": "关闭-空心 退出 错误", - "cls": "layui-icon-close" -}, { - "name": "正确", - "cls": "layui-icon-ok-circle" -}, { - "name": "导入", - "cls": "layui-icon-add-circle-fine" -}] -``` \ No newline at end of file From e510bd1afc09ecfc2c9978e2cd6fbd4c01645f5c Mon Sep 17 00:00:00 2001 From: newpanjing Date: Mon, 29 Apr 2019 10:11:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?#23=20=F0=9F=8D=89=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=BF=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleui/templates/admin/search_form.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/simpleui/templates/admin/search_form.html b/simpleui/templates/admin/search_form.html index 6cda238d..223ba9bf 100644 --- a/simpleui/templates/admin/search_form.html +++ b/simpleui/templates/admin/search_form.html @@ -191,4 +191,8 @@ }) +{% else %} + {% endif %} From d5cee3604e4ce58c3eed4f044d5407ba22b98d52 Mon Sep 17 00:00:00 2001 From: newpanjing Date: Mon, 29 Apr 2019 10:32:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?#20=20=F0=9F=8D=8A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5=E8=BF=87=E6=BB=A4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleui/templates/admin/search_form.html | 50 +++++++++++++++++++---- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/simpleui/templates/admin/search_form.html b/simpleui/templates/admin/search_form.html index 223ba9bf..6194a863 100644 --- a/simpleui/templates/admin/search_form.html +++ b/simpleui/templates/admin/search_form.html @@ -146,11 +146,29 @@ }, created: function () { var self = this; + var date_field = []; + {% if cl.has_filters %} + {% for spec in cl.filter_specs %} + {% if spec.links %} + date_field.push('{{ spec.field_path }}') + {% endif %} + {% endfor %} + {% endif %} $('.form-params').each(function () { var key = $(this).attr('data-name'); var value = $(this).val(); self[key] = value; - }) + }); + try { + date_field.forEach(key => { + var start = self[key + "__gte"]; + var end = self[key + "__lt"]; + self[key] = [start, end]; + }); + } catch (e) { + console.warn('日期值回显失败,也许是django版本问题,请至github报告此问题:https://github.com/newpanjing/simpleui/issues'); + } + }, watch: { {% if cl.has_filters %} @@ -158,15 +176,29 @@ {% if spec.links %} '{{ spec.field_path }}': function (newValue, oldValue) { var type = '{{ spec | get_date_type }}' - if (newValue) { - - if (type == 'date') { - this['{{ spec.field_generic }}gte'] = newValue[0].format('yyyy-MM-dd'); - this['{{ spec.field_generic }}lt'] = newValue[1].format('yyyy-MM-dd') - } else if (type == 'datetime') { - this['{{ spec.field_generic }}gte'] = newValue[0].format('yyyy-MM-dd hh:mm:ss+08:00'); - this['{{ spec.field_generic }}lt'] = newValue[1].format('yyyy-MM-dd hh:mm:ss+08:00') + try { + if (newValue) { + if (newValue[0] != "" && newValue[1] != "") { + + if (type == 'date') { + this['{{ spec.field_generic }}gte'] = newValue[0].format('yyyy-MM-dd'); + this['{{ spec.field_generic }}lt'] = newValue[1].format('yyyy-MM-dd'); + } else if (type == 'datetime') { + this['{{ spec.field_generic }}gte'] = newValue[0].format('yyyy-MM-dd hh:mm:ss+08:00'); + this['{{ spec.field_generic }}lt'] = newValue[1].format('yyyy-MM-dd hh:mm:ss+08:00'); + } + } + } else { + if (type == 'date') { + this['{{ spec.field_generic }}gte'] = ''; + this['{{ spec.field_generic }}lt'] = ''; + } else if (type == 'datetime') { + this['{{ spec.field_generic }}gte'] = ''; + this['{{ spec.field_generic }}lt'] = ''; + } } + } catch (e) { + // } {#console.log(newValue)#} {#console.log(oldValue)#} From 07c1802b4bf62bdca3a5af089c726223d216b094 Mon Sep 17 00:00:00 2001 From: newpanjing Date: Mon, 29 Apr 2019 11:05:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?#IVSQ5=20=F0=9F=90=A7=E4=BF=AE=E5=A4=8Dadmi?= =?UTF-8?q?n=E5=88=97=E7=AD=BE=20=E4=B8=8B=EF=BC=8C=E6=96=B0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=89=93=E5=BC=80=E9=80=89=E9=A1=B9=EF=BC=8C=E6=80=BB?= =?UTF-8?q?=E6=98=AF=E6=89=93=E5=BC=80=E4=B8=80=E7=BA=A7=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleui/static/admin/simpleui-x/js/index.js | 6 +++++- simpleui/templates/admin/index.html | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js index a6f02703..26aa29a1 100644 --- a/simpleui/static/admin/simpleui-x/js/index.js +++ b/simpleui/static/admin/simpleui-x/js/index.js @@ -87,7 +87,7 @@ text: getLanuage('Open in a new page'), icon: 'el-icon-news', handler: function (tab, item) { - window.open(tab.url); + window.open(tab.newUrl); } }] } @@ -121,6 +121,10 @@ } }, methods: { + iframeLoad: function (tab, e) { + url = e.target.contentWindow.location.href + tab.newUrl = url; + }, setTheme: function (item) { var url = window.themeUrl; if (item.file && item.file != '') { diff --git a/simpleui/templates/admin/index.html b/simpleui/templates/admin/index.html index 53286518..87c20290 100755 --- a/simpleui/templates/admin/index.html +++ b/simpleui/templates/admin/index.html @@ -162,7 +162,7 @@ {% include './home.html' %} {% endif %} - + @@ -177,7 +177,6 @@ v-text="item.text"> - @@ -248,14 +247,15 @@ } - +{##} + - + {% load_analysis %} \ No newline at end of file From 1c641802e2ef12620898173c6a950a6284885cae Mon Sep 17 00:00:00 2001 From: newpanjing Date: Mon, 29 Apr 2019 11:14:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8F=91=E5=B8=832.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleui/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpleui/__init__.py b/simpleui/__init__.py index 43d87174..ff42687e 100644 --- a/simpleui/__init__.py +++ b/simpleui/__init__.py @@ -1,2 +1,2 @@ def get_version(): - return '2.0.4' + return '2.0.5'