diff --git a/nladmin-ui/package.json b/nladmin-ui/package.json index 4fcddd2fc..f62d896c8 100644 --- a/nladmin-ui/package.json +++ b/nladmin-ui/package.json @@ -112,7 +112,7 @@ "plop": "2.3.0", "print-template": "^1.2.5", "runjs": "^4.3.2", - "sass": "^1.26.10", + "sass": "~1.26.5", "sass-loader": "^7.1.0", "script-ext-html-webpack-plugin": "2.1.3", "script-loader": "0.7.2", diff --git a/nladmin-ui/src/main.js b/nladmin-ui/src/main.js index 726997549..77b320a5e 100644 --- a/nladmin-ui/src/main.js +++ b/nladmin-ui/src/main.js @@ -1,14 +1,7 @@ import Vue from 'vue' - -import Cookies from 'js-cookie' import 'normalize.css/normalize.css' import Element from 'element-ui' -// 列自适应宽度:https://github.com/legendJaden/AFTableColumn -import AFTableColumn from 'af-table-column' - -// 可编辑grid插件 -import 'xe-utils' import 'font-awesome/css/font-awesome.css' @@ -44,18 +37,27 @@ import 'jquery' import LogicFlow from '@logicflow/core' import { Menu } from '@logicflow/extension' import '@logicflow/extension/lib/style/index.css' -LogicFlow.use(Menu) // Form Generator 组件需要使用到 tinymce import Tinymce from '@/views/system/build/tinymce/index.vue' -Vue.component('tinymce', Tinymce) -// import '@/views/system/build/icons' import request from '@/utils/request' // 实现 form generator 使用自己定义的 axios request 对象 + +import { addDateRange, handleTree, parseTime, resetForm, selectDictLabel, selectDictLabels } from '@/utils/nladmin' + +LogicFlow.use(Menu) + +Vue.component('tinymce', Tinymce) Vue.prototype.$axios = request -Vue.use(scroll) +// 全局方法挂载 +Vue.prototype.parseTime = parseTime +Vue.prototype.resetForm = resetForm +Vue.prototype.addDateRange = addDateRange +Vue.prototype.selectDictLabel = selectDictLabel +Vue.prototype.selectDictLabels = selectDictLabels +Vue.prototype.handleTree = handleTree -Vue.use(AFTableColumn) +Vue.use(scroll) Vue.use(VueHighlightJS) Vue.use(mavonEditor) @@ -76,27 +78,3 @@ new Vue({ store, render: h => h(App) }) - -// var time1 = new Date().format("yyyy-MM-dd hh:mm:ss"); -// eslint-disable-next-line no-extend-native -Date.prototype.format = function(fmt) { - var o = { - 'M+': this.getMonth() + 1, // 月份 - 'd+': this.getDate(), // 日 - 'h+': this.getHours(), // 小时 - 'm+': this.getMinutes(), // 分 - 's+': this.getSeconds(), // 秒 - 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度 - 'S': this.getMilliseconds() // 毫秒 - } - if (/(y+)/.test(fmt)) { - fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length)) - } - for (var k in o) { - if (new RegExp('(' + k + ')').test(fmt)) { - fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length))) - } - } - return fmt -} - diff --git a/nladmin-ui/src/utils/nladmin.js b/nladmin-ui/src/utils/nladmin.js index e69de29bb..42ee3a53f 100644 --- a/nladmin-ui/src/utils/nladmin.js +++ b/nladmin-ui/src/utils/nladmin.js @@ -0,0 +1,224 @@ + +/** + * 通用js方法封装处理 + * Copyright (c) 2019 ruoyi + */ + +// 日期格式化 +export function parseTime(time, pattern) { + if (arguments.length === 0 || !time) { + return null + } + const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + time = parseInt(time) + } else if (typeof time === 'string') { + time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '') + } + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { + let value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } + if (result.length > 0 && value < 10) { + value = '0' + value + } + return value || 0 + }) + return time_str +} + +// 表单重置 +export function resetForm(refName) { + if (this.$refs[refName]) { + this.$refs[refName].resetFields() + } +} + +// 添加日期范围 +export function addDateRange(params, dateRange, propName) { + const search = params + search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {} + dateRange = Array.isArray(dateRange) ? dateRange : [] + if (typeof (propName) === 'undefined') { + search.params['beginTime'] = dateRange[0] + search.params['endTime'] = dateRange[1] + } else { + search.params['begin' + propName] = dateRange[0] + search.params['end' + propName] = dateRange[1] + } + return search +} + +// 回显数据字典 +export function selectDictLabel(datas, value) { + var actions = [] + Object.keys(datas).some((key) => { + if (datas[key].value == ('' + value)) { + actions.push(datas[key].label) + return true + } + }) + return actions.join('') +} + +// 回显数据字典（字符串数组） +export function selectDictLabels(datas, value, separator) { + if (value === undefined) { + return '' + } + var actions = [] + var currentSeparator = undefined === separator ? ',' : separator + var temp = value.split(currentSeparator) + Object.keys(value.split(currentSeparator)).some((val) => { + Object.keys(datas).some((key) => { + if (datas[key].value == ('' + temp[val])) { + actions.push(datas[key].label + currentSeparator) + } + }) + }) + return actions.join('').substring(0, actions.join('').length - 1) +} + +// 字符串格式化(%s ) +export function sprintf(str) { + var args = arguments; var flag = true; var i = 1 + str = str.replace(/%s/g, function() { + var arg = args[i++] + if (typeof arg === 'undefined') { + flag = false + return '' + } + return arg + }) + return flag ? str : '' +} + +// 转换字符串，undefined,null等转化为"" +export function parseStrEmpty(str) { + if (!str || str == 'undefined' || str == 'null') { + return '' + } + return str +} + +// 数据合并 +export function mergeRecursive(source, target) { + for (var p in target) { + try { + if (target[p].constructor == Object) { + source[p] = mergeRecursive(source[p], target[p]) + } else { + source[p] = target[p] + } + } catch (e) { + source[p] = target[p] + } + } + return source +} + +/** + * 构造树型结构数据 + * @param {*} data 数据源 + * @param {*} id id字段 默认 'id' + * @param {*} parentId 父节点字段 默认 'parentId' + * @param {*} children 孩子节点字段 默认 'children' + */ +export function handleTree(data, id, parentId, children) { + const config = { + id: id || 'id', + parentId: parentId || 'parentId', + childrenList: children || 'children' + } + + var childrenListMap = {} + var nodeIds = {} + var tree = [] + + for (const d of data) { + const parentId = d[config.parentId] + if (childrenListMap[parentId] == null) { + childrenListMap[parentId] = [] + } + nodeIds[d[config.id]] = d + childrenListMap[parentId].push(d) + } + + for (const d of data) { + const parentId = d[config.parentId] + if (nodeIds[parentId] == null) { + tree.push(d) + } + } + + for (const t of tree) { + adaptToChildrenList(t) + } + + function adaptToChildrenList(o) { + if (childrenListMap[o[config.id]] !== null) { + o[config.childrenList] = childrenListMap[o[config.id]] + } + if (o[config.childrenList]) { + for (const c of o[config.childrenList]) { + adaptToChildrenList(c) + } + } + } + return tree +} + +/** + * 参数处理 + * @param {*} params 参数 + */ +export function tansParams(params) { + let result = '' + for (const propName of Object.keys(params)) { + const value = params[propName] + var part = encodeURIComponent(propName) + '=' + if (value !== null && typeof (value) !== 'undefined') { + if (typeof value === 'object') { + for (const key of Object.keys(value)) { + if (value[key] !== null && typeof (value[key]) !== 'undefined') { + const params = propName + '[' + key + ']' + var subPart = encodeURIComponent(params) + '=' + result += subPart + encodeURIComponent(value[key]) + '&' + } + } + } else { + result += part + encodeURIComponent(value) + '&' + } + } + } + return result +} + +// 验证是否为blob格式 +export async function blobValidate(data) { + try { + const text = await data.text() + JSON.parse(text) + return false + } catch (error) { + return true + } +}