Skip to content

T
topsun-bpm
Commit 2984d130 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

新增/修改资源值时，传null值，保存报错的问题； 

日期选择
parent da186756
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 72 deletions
huigou-xt/src/main/webapp/WEB-INF/taglib.tld
View file @ 2984d130
......@@ -243,12 +243,12 @@
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>type</name>
<required>true</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
......@@ -258,22 +258,22 @@
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>id</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>value</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>type</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
......@@ -472,7 +472,7 @@
<attribute>
<name>wrapper</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>fieldCol</name>
......@@ -487,22 +487,22 @@
<attribute>
<name>dataOptions</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>match</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>mask</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>property</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>required</name>
......@@ -512,61 +512,61 @@
<attribute>
<name>spinner</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[The css class to use for element]]></description>
<name>cssClass</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[The css style definitions for element to use]]></description>
<name>cssStyle</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
<name>disabled</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[HTML id attribute]]></description>
<name>id</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[Set the key (name, value, label) for this particular component]]></description>
<name>key</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[Label expression used for rendering an element specific label]]></description>
<name>label</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[Deprecated. Use maxlength instead.]]></description>
<name>maxLength</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[HTML maxlength attribute]]></description>
<name>maxlength</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[The name to set for element]]></description>
<name>name</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[Whether the input is readonly]]></description>
......@@ -578,19 +578,19 @@
<description><![CDATA[Set the html title attribute on rendered html element]]></description>
<name>title</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[Specifies the html5 type element to display. e.g. text, email, url]]></description>
<name>type</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[Preset the value of input element.]]></description>
<name>value</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
......@@ -601,12 +601,12 @@
<attribute>
<name>property</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>dictionary</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>filter</name>
......@@ -646,7 +646,7 @@
<description><![CDATA[HTML id attribute]]></description>
<name>id</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[Set the key (name, value, label) for this particular component]]></description>
......@@ -670,7 +670,7 @@
<description><![CDATA[The name to set for element]]></description>
<name>name</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[Size of the element box (# of elements to show)]]></description>
......@@ -682,13 +682,13 @@
<description><![CDATA[Set the html title attribute on rendered html element]]></description>
<name>title</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[Preset the value of input element.]]></description>
<name>value</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
......
topsun-xt/src/main/webapp/biz/topsun/resource/fieldValueDetail.js deleted 100644 → 0
View file @ da186756
$(document).ready(function () {
initResourceFields();
});
function initResourceFields() {
Public.ajax(web_app.name + "/resourceField/getResourceFieldValue.ajax", {
resourceTypeId: $("#resourceTypeId").val(),id: $("#id").val()
}, function (data) {
var $d = $('#submitForm .hg-form-row');
for (var i = 0; i < data.length; i++) {
var field = data[i];
var ss = $(`<div class="col-xs-4 col-sm-2">
<label class="hg-form-label" id="${field.resourceFiledTitle}_label" title="${field.resourceFiledTitle}">
${field.resourceFiledTitle} :
</label>
</div>
<div class="col-xs-8 col-sm-4 col-warp col-white-bg">
<input type="text" name="${field.resourceFieldName}" id="${field.resourceFieldName}" value="${field.resourceFieldValue}" label="${field.resourceFiledTitle}">
</div>`)
$d.append(ss);
//input1.attr('value', data[i]);
}
}
)
}
topsun-xt/src/main/webapp/biz/topsun/resource/fieldValueDetail.jsp
View file @ 2984d130
<%@ page language="java" contentType="text/html; charset=utf-8"%>
<%@taglib uri="/WEB-INF/taglib.tld" prefix="x"%>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<head>
<x:script src='/biz/topsun/resource/fieldValueDetail.js'/>
</head>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id" />
<x:hidden name="resourceTypeId"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<c:forEach var="resourceFiledVo" items="${resourceFiledVos}">
<c:set var="fieldName" value="${resourceFiledVo.resourceFieldName}" />
<c:set var="fieldTitle" value="${resourceFiledVo.resourceFiledTitle}" />
<c:set var="fieldValue" value="${resourceFiledVo.resourceFieldValue}" />
<c:if test="${resourceFiledVo.resourceFieldShow==1}">
<c:if test="${resourceFiledVo.resourceFieldType=='string' || resourceFiledVo.resourceFieldType=='int' || resourceFiledVo.resourceFieldType=='double'}">
<x:inputC name="${fieldName}" title="${fieldTitle}" label="${fieldTitle}" value="${fieldValue}" labelCol="2" fieldCol="4" />
</c:if>
<c:if test="${resourceFiledVo.resourceFieldType=='date'}">
<x:inputC name="${fieldName}" title="${fieldTitle}" label="${fieldTitle}" value="${fieldValue}" labelCol="2" fieldCol="4" wrapper="date" />
</c:if>
<%--<c:if test="${resourceFiledVo.resourceFieldType=='double'}">
<x:inputC name="${fieldName}" title="${fieldTitle}" label="${fieldTitle}" labelCol="2" value="${fieldValue}" fieldCol="4" maxlength="32" mask="money" />
</c:if>--%>
</c:if>
<c:if test="${resourceFiledVo.resourceFieldShow==0}">
<x:hidden name="${fieldName}" value="${fieldValue}"/>
</c:if>
</c:forEach>
</div>
</div>
</form>
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/resource/resourceList.js
View file @ 2984d130
......@@ -139,7 +139,7 @@ function updateHandler(id) {
UICtrl.showAjaxDialog({
title: $.i18nProp('资源值'),
width: 600,
url: web_app.name + '/resourceField/forwardUpdateResourceFieldValue.load',
url: web_app.name + '/resourceField/forwardAddResourceFieldValue.load',
param: {id: id,resourceTypeId: $('#resourceTypeId').val()},
ok: update,
close:dialogClose
......
topsun/src/main/java/com/huigou/topsun/resource/controller/ResourceFieldController.java
View file @ 2984d130
......@@ -30,24 +30,36 @@ public class ResourceFieldController extends CommonController {
@Resource
private ResourceFiledService resourceFiledService;
/**
* 跳转到新增/修改资源值的页面
* @return
*/
public String forwardAddResourceFieldValue(){
SDO sdo = this.getSDO();
String id = sdo.getString("id");
String resourceTypeId = sdo.getString("resourceTypeId");
this.putAttribute("resourceTypeId",resourceTypeId);
List<ResourceFiledVo> resourceFiledVos = resourceFiledService.findFieldValueByResourceTypeIdAndId(resourceTypeId, id);
this.putAttribute("resourceFiledVos",resourceFiledVos);
return forward("fieldValueDetail");
}
public String forwardUpdateResourceFieldValue(){
return forward("fieldValueDetail");
}
//@Operation(summary = "")
//@Operation(summary = "根据资源类型id，查询资源字段")
/**
* 根据资源类型id，查询资源字段
* @return
*/
public String getResourceField(){
SDO sdo = this.getSDO();
String resourceTypeId = sdo.getString("resourceTypeId");
return toResult(resourceFiledService.findByResourceTypeId(resourceTypeId));
}
/**
* 根据资源类型id和资源值id查询资源
* @return
*/
public String getResourceFieldValue(){
SDO sdo = this.getSDO();
String id = sdo.getString("id");
......
topsun/src/main/java/com/huigou/topsun/resource/service/impl/ResourceFiledServiceImpl.java
View file @ 2984d130
package com.huigou.topsun.resource.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -158,13 +159,17 @@ public class ResourceFiledServiceImpl extends ServiceImpl<ResourceFiledMapper, R
if (resourceFiled.getResourceFieldName().equals(key)){
ResourceFieldValue resourceFieldValue = new ResourceFieldValue();
resourceFieldValue.setField(key);
//如果值是字符串，文本，日期格式的需要加英文状态下的引号： ''
if ("string".equals(resourceFiled.getResourceFieldType()) ||
"date".equals(resourceFiled.getResourceFieldType()) ||
"text".equals(resourceFiled.getResourceFieldType()) ){
resourceFieldValue.setValue("'" + map.get(key) + "'");
Object obj = map.get(key);
if (ObjectUtil.isEmpty(obj)){
resourceFieldValue.setValue("NULL");
}else {
resourceFieldValue.setValue(map.get(key));
//如果值是字符串，文本，日期格式的需要加英文状态下的引号： ''
if ("string".equals(resourceFiled.getResourceFieldType()) ||
"date".equals(resourceFiled.getResourceFieldType())){
resourceFieldValue.setValue("'" + obj + "'");
}else {
resourceFieldValue.setValue(obj);
}
}
resourceFieldValues.add(resourceFieldValue);
}
......
topsun/src/main/resources/config/topsun/mapper/resource/ResourceFiledMapper.xml
View file @ 2984d130
......@@ -90,10 +90,8 @@
</if>
</foreach>
values
<foreach collection="resourceFieldValues" item="resourceFieldValue" separator="," open="(" close=")">
<if test="resourceFieldValue.value != null and resourceFieldValue.value != ''">
${resourceFieldValue.value}
</if>
<foreach collection="resourceFieldValues" item="resourceFieldValue" separator="," open="(" close=")" nullable="true">
${resourceFieldValue.value}
</foreach>
</insert>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment