|
@@ -449,7 +449,7 @@ public class ExcelTabController extends BladeController {
|
|
@ApiImplicitParam(name = "tabId", value = "表Id", required = true),
|
|
@ApiImplicitParam(name = "tabId", value = "表Id", required = true),
|
|
})
|
|
})
|
|
public R<List<ExceTabTreVO>> saveLinkeTab(Long exceTabId, Long tabId) throws IOException {
|
|
public R<List<ExceTabTreVO>> saveLinkeTab(Long exceTabId, Long tabId) throws IOException {
|
|
- //String file_path ="C:\\Users\\Administrator\\Desktop\\fsdownload\\"; //ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
|
|
|
|
|
|
+ //String file_path =ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
|
|
String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
|
|
String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
|
|
|
|
|
|
// 关联 私有项目 wbs 数据信息
|
|
// 关联 私有项目 wbs 数据信息
|
|
@@ -910,9 +910,6 @@ public class ExcelTabController extends BladeController {
|
|
zikey.add(dataInfo);
|
|
zikey.add(dataInfo);
|
|
}
|
|
}
|
|
} else { //空行
|
|
} else { //空行
|
|
- if (i == 20) {
|
|
|
|
- System.out.println("");
|
|
|
|
- }
|
|
|
|
|
|
|
|
List<Map<String, String>> left = new ArrayList<>();
|
|
List<Map<String, String>> left = new ArrayList<>();
|
|
List<Map<String, String>> top = new ArrayList<>();
|
|
List<Map<String, String>> top = new ArrayList<>();
|
|
@@ -936,9 +933,6 @@ public class ExcelTabController extends BladeController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (i == 9 && j == 2) {
|
|
|
|
- System.out.println();
|
|
|
|
- }
|
|
|
|
|
|
|
|
String inputText = "";
|
|
String inputText = "";
|
|
// 特征值赛选 规则
|
|
// 特征值赛选 规则
|
|
@@ -1011,14 +1005,38 @@ public class ExcelTabController extends BladeController {
|
|
colTitle.add(exctabCell);
|
|
colTitle.add(exctabCell);
|
|
data.attr("title", inputText);
|
|
data.attr("title", inputText);
|
|
|
|
|
|
- } else if (textInfo.indexOf("□") >= 0) { //下拉框
|
|
|
|
-
|
|
|
|
|
|
+ } else if (textInfo.indexOf("□") >= 0) { //多选框
|
|
exctabCell.setTextInfo(inputText);
|
|
exctabCell.setTextInfo(inputText);
|
|
exctabCell.setExctabId(excelId);
|
|
exctabCell.setExctabId(excelId);
|
|
exctabCell.setIsDeleted(0);
|
|
exctabCell.setIsDeleted(0);
|
|
exctabCell.setXys(i + "_" + j);
|
|
exctabCell.setXys(i + "_" + j);
|
|
colTitle.add(exctabCell);
|
|
colTitle.add(exctabCell);
|
|
data.attr("title", inputText);
|
|
data.attr("title", inputText);
|
|
|
|
+ // 添加多选框
|
|
|
|
+
|
|
|
|
+ String[] cheText = textInfo.split("□");
|
|
|
|
+ JSONArray objs = new JSONArray();
|
|
|
|
+ if (cheText != null && cheText.length >= 1) {
|
|
|
|
+ int key =1;
|
|
|
|
+ for (String keyval:cheText) {
|
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
|
+ if(StringUtils.isNotEmpty(keyval)){
|
|
|
|
+ jsonObject.put("key", key);
|
|
|
|
+ jsonObject.put("name", keyval);
|
|
|
|
+ objs.add(jsonObject);
|
|
|
|
+ keyId+=1;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }else{
|
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
|
+ jsonObject.put("key", "1");
|
|
|
|
+ jsonObject.put("name", "");
|
|
|
|
+ objs.add(jsonObject);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ String checkbox = "<hc-form-checkbox-group :objs='"+objs+"' @change='checkboxGroupChange' @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+" x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" placeholder=''> </hc-form-checkbox-group>";
|
|
|
|
+ data.empty().append(checkbox);
|
|
|
|
+
|
|
} else {
|
|
} else {
|
|
if (index_state) { // 区域内
|
|
if (index_state) { // 区域内
|
|
if (rowspan >= 1) {
|
|
if (rowspan >= 1) {
|