root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/nladmin

Browse Source
This commit is contained in:
DESKTOP-BE1EA0I\14194
2022-09-21 10:49:56 +08:00
parent 3cd336d1cc 0bab0084a4
commit 6e11972ae2
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nladmin-ui/src/components/Crud/UD.operation.vue
View File

@@ -1,14 +1,15 @@
<template>
<div>
<el-button v-if="isVisiableEdit" v-permission="permission.edit" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(data)" />
<el-button v-if="isVisiableEdit" v-permission="permission.edit" type="text" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" icon="el-icon-edit" @click="crud.toEdit(data)">修改</el-button>
<el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide">
<p>{{ msg }}</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="doCancel">取消</el-button>
<el-button :loading="crud.dataStatus[crud.getDataId(data)].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">确定</el-button>
</div>
<el-button v-if="isVisiableDel" slot="reference" :disabled="disabledDle" type="danger" icon="el-icon-delete" size="mini" @click="toDelete" />
<el-button v-if="isVisiableDel" slot="reference" type="text" :disabled="disabledDle" icon="el-icon-delete" size="mini" @click="toDelete">删除</el-button>
</el-popover>
</div>
</template>
<script>

5
nladmin-ui/src/main.js
View File

@@ -61,8 +61,11 @@ Vue.use(VueHighlightJS)
Vue.use(mavonEditor)
Vue.use(permission)
Vue.use(dict)
// 全局设置控件样式https://codeantenna.com/a/0IN5FMJk5h
Element.Table.props.border = { type: Boolean, default: true }
Element.TableColumn.props.align = { type: String, default: 'center' }
Vue.use(Element, {
size: Cookies.get('size') || 'small' // set element-ui default size
size: 'mini' // set element-ui default size
})
Vue.config.productionTip = false

2
nladmin-ui/src/views/system/logicflow/index.vue
View File

@@ -41,7 +41,7 @@
<el-table-column v-if="false" prop="stage_uuid" label="舞台标识" />
<el-table-column prop="stage_code" label="舞台编码" />
<el-table-column prop="stage_name" label="舞台名字" />
<el-table-column prop="stage_data" label="舞台数据" />
<el-table-column prop="stage_data" label="舞台数据" show-overflow-tooltip />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" min-width="135" />
<el-table-column prop="update_by" label="修改者" />

4
nladmin-wql/src/main/java/org/nl/wql/util/WqlUtil.java
View File

@@ -1,7 +1,6 @@
package org.nl.wql.util;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.nl.wql.core.content.HttpContext;
import org.springframework.data.domain.Pageable;
@@ -15,7 +14,6 @@ import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.net.URI;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -43,6 +41,8 @@ public class WqlUtil {
} else if ("java.lang.Long".equals(classStr)) {
Long e = (Long) o;
str = e.toString();
} else if ("java.lang.Double".equals(classStr)) {
str = String.valueOf(o);
} else if ("oracle.sql.CLOB".equals(classStr)) {
/* CLOB e2 = (CLOB) o;