Browse Source

BI-67659 fix: 字段类型显示

master
Zhenfei.Li 4 years ago
parent
commit
86ccfdaf57
  1. 10
      plugin.xml
  2. 3
      src/main/resources/com/fr/plugin/hw/decision/js/attr/col.attr.js
  3. 2
      src/main/resources/com/fr/plugin/hw/decision/js/attr/col.attr.model.js
  4. 2
      src/main/resources/com/fr/plugin/hw/decision/js/attr/table.attr.js
  5. 2
      src/main/resources/com/fr/plugin/hw/decision/js/attr/table.attr.model.js
  6. 2
      src/main/resources/com/fr/plugin/hw/decision/js/hw.option.js
  7. 1
      src/main/resources/com/fr/plugin/hw/decision/js/hw.table.add.pop.js
  8. 1
      src/main/resources/com/fr/plugin/hw/decision/js/pane/left.linklist.model.js
  9. 1
      src/main/resources/com/fr/plugin/hw/decision/js/table.info.js
  10. 3
      src/main/resources/com/fr/plugin/hw/decision/js/table.info.model.js

10
plugin.xml

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><plugin> <?xml version="1.0" encoding="UTF-8" standalone="no"?><plugin>
<id>com.fr.plugin.hw.import.excel</id> <id>com.fr.plugin.hw.import.excel</id>
<name><![CDATA[直接导入数据库表]]></name> <name><![CDATA[Excel导入成数据库表]]></name>
<active>yes</active> <active>yes</active>
<version>1.8.3</version> <version>2.0.0</version>
<env-version>10.0</env-version> <env-version>10.0</env-version>
<jartime>2018-07-31</jartime> <jartime>2018-07-31</jartime>
<vendor>author</vendor> <vendor>帆软</vendor>
<description><![CDATA[直接导入数据库表]]></description> <description><![CDATA[Excel导入成数据库表]]></description>
<change-notes><![CDATA[区分链接权限,管理员可见全部,普通用户仅可见本人创建]]></change-notes> <change-notes><![CDATA[导入的数据库将自动创建到我的自助数据集]]></change-notes>
<extra-decision> <extra-decision>
<SystemOptionProvider class="com.fr.plugin.decision.HWOptionProvider"/> <SystemOptionProvider class="com.fr.plugin.decision.HWOptionProvider"/>
<HttpHandlerProvider class="com.fr.plugin.decision.request.HWHandlerProvider"/> <HttpHandlerProvider class="com.fr.plugin.decision.request.HWHandlerProvider"/>

3
src/main/resources/com/fr/plugin/hw/decision/js/attr/col.attr.js

@ -71,8 +71,6 @@
}, },
_getFieldItems: function () { _getFieldItems: function () {
var self = this;
console.log("fieldItems", this.model.perItems)
return BI.map(this.model.perItems, function (idx, field) { return BI.map(this.model.perItems, function (idx, field) {
var items = [{ var items = [{
type: "bi.label", type: "bi.label",
@ -90,7 +88,6 @@
}, },
_formatItems: function (items) { _formatItems: function (items) {
console.log("_formatItems");
var allResult=[]; var allResult=[];
var self = this, o = this.options; var self = this, o = this.options;
self.colName = []; self.colName = [];

2
src/main/resources/com/fr/plugin/hw/decision/js/attr/col.attr.model.js

@ -43,7 +43,7 @@
id: BI.UUID(), id: BI.UUID(),
colName: "", colName: "",
colType: "12", colType: "12",
colLength: "7000", colLength: "255",
excelCol: "", excelCol: "",
primaryKey: false primaryKey: false
}) })

2
src/main/resources/com/fr/plugin/hw/decision/js/attr/table.attr.js

@ -15,7 +15,6 @@
info: {} info: {}
}, },
_store: function () { _store: function () {
console.log("table.attr.js");
return BI.Models.getModel("dec.hw.table.attr.model"); return BI.Models.getModel("dec.hw.table.attr.model");
}, },
watch: { watch: {
@ -31,7 +30,6 @@
}, },
render: function () { render: function () {
var self = this, o = this.options, borderEditorWidth = EDITOR_WIDTH - 2; var self = this, o = this.options, borderEditorWidth = EDITOR_WIDTH - 2;
console.log("table.attr.js");
return { return {
type: "bi.vertical", type: "bi.vertical",
width: 640, width: 640,

2
src/main/resources/com/fr/plugin/hw/decision/js/attr/table.attr.model.js

@ -19,7 +19,6 @@
initData: function (callback) { initData: function (callback) {
var self=this; var self=this;
Dec.Utils.getConnections(function (res) { Dec.Utils.getConnections(function (res) {
console.log(res);
self.model.connectionItems = self.model.connectionItems =
BI.map( BI.map(
/*// 根据驱动过滤下数据连接 /*// 根据驱动过滤下数据连接
@ -61,7 +60,6 @@
"/url/excelmng/getSchema?connectionName=" + v, "/url/excelmng/getSchema?connectionName=" + v,
null,null, null,null,
function (e) { function (e) {
console.log(e);
self.model.schemaItems = e.data; self.model.schemaItems = e.data;
self.setSchemaLoaded(true); self.setSchemaLoaded(true);
} }

2
src/main/resources/com/fr/plugin/hw/decision/js/hw.option.js

@ -59,7 +59,7 @@
{value: "91", text: "日期"} {value: "91", text: "日期"}
]); ]);
BI.constant("dec.hw.col.type.int", [2, 4]); BI.constant("dec.hw.col.type.int", [2, 4, 8]);
BI.constant("dec.hw.col.type.str", [1, 12]); BI.constant("dec.hw.col.type.str", [1, 12]);
BI.constant("dec.hw.col.type.bool", [-7, 16]); BI.constant("dec.hw.col.type.bool", [-7, 16]);
BI.constant("dec.hw.col.type.date", [91, 93]); BI.constant("dec.hw.col.type.date", [91, 93]);

1
src/main/resources/com/fr/plugin/hw/decision/js/hw.table.add.pop.js

@ -105,7 +105,6 @@
end: function () { end: function () {
var self = this; var self = this;
self.store.setImportStatus("importing"); self.store.setImportStatus("importing");
console.log("end");
if (self.getValue().infoId == "add") { if (self.getValue().infoId == "add") {
self._tableNameExistsAndImportChecker(); self._tableNameExistsAndImportChecker();

1
src/main/resources/com/fr/plugin/hw/decision/js/pane/left.linklist.model.js

@ -39,7 +39,6 @@
var self = this ; var self = this ;
Dec.reqGet("/url/excelmng/querylink?containReuse=" + self.options.containReuse,null,function(e){ Dec.reqGet("/url/excelmng/querylink?containReuse=" + self.options.containReuse,null,function(e){
self.model.linklist = e.data; self.model.linklist = e.data;
console.log(self.model.linklist);
BI.isFunction(callback) && callback(); BI.isFunction(callback) && callback();
},BI.emptyFn) },BI.emptyFn)
}, },

1
src/main/resources/com/fr/plugin/hw/decision/js/table.info.js

@ -53,7 +53,6 @@
}, { }, {
eventName: BI.MultifileEditor.EVENT_UPLOADED, eventName: BI.MultifileEditor.EVENT_UPLOADED,
action: function (args) { action: function (args) {
console.log("EVENT_UPLOADED");
var files = this.getValue(); var files = this.getValue();
if (files[files.length - 1].errorCode) { if (files[files.length - 1].errorCode) {
BI.Msg.toast(BI.i18nText(files[files.length - 1].errorMsg), { BI.Msg.toast(BI.i18nText(files[files.length - 1].errorMsg), {

3
src/main/resources/com/fr/plugin/hw/decision/js/table.info.model.js

@ -74,7 +74,6 @@
transferName: "", transferName: "",
reset: true reset: true
}, function (res) { }, function (res) {
console.log(res);
if (res.success) { if (res.success) {
var fields = res.data.fields; var fields = res.data.fields;
self.model.result.sheetNo = 0; self.model.result.sheetNo = 0;
@ -148,7 +147,7 @@
id:BI.UUID(), id:BI.UUID(),
colName: item.name || item.colName, colName: item.name || item.colName,
colType: item.type || 16, colType: item.type || 16,
colLength: "7000", colLength: "255",
excelCol: index excelCol: index
} }
}); });

Loading…
Cancel
Save