Merge remote-tracking branch 'origin/fix-bug-202303' into fix-bug-202303
This commit is contained in:
@@ -1489,14 +1489,14 @@
|
|||||||
}));
|
}));
|
||||||
while (t.length) n = n.then(t.shift(), t.shift());
|
while (t.length) n = n.then(t.shift(), t.shift());
|
||||||
return n
|
return n
|
||||||
}, a.forEach(["delete", "get", "head", "options"], (function(e) {
|
}, a.forEach(["get", "head", "options"], (function(e) {
|
||||||
s.prototype[e] = function(t, n) {
|
s.prototype[e] = function(t, n) {
|
||||||
return this.request(a.merge(n || {}, {
|
return this.request(a.merge(n || {}, {
|
||||||
method: e,
|
method: e,
|
||||||
url: t
|
url: t
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
})), a.forEach(["post", "put", "patch"], (function(e) {
|
})), a.forEach(["post", "patch"], (function(e) {
|
||||||
s.prototype[e] = function(t, n, r) {
|
s.prototype[e] = function(t, n, r) {
|
||||||
return this.request(a.merge(r || {}, {
|
return this.request(a.merge(r || {}, {
|
||||||
method: e,
|
method: e,
|
||||||
@@ -8082,7 +8082,7 @@
|
|||||||
function o(e, t) {
|
function o(e, t) {
|
||||||
return Object(r["a"])({
|
return Object(r["a"])({
|
||||||
url: e,
|
url: e,
|
||||||
method: "put",
|
method: "post",
|
||||||
data: t
|
data: t
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -8098,7 +8098,7 @@
|
|||||||
function c(e, t) {
|
function c(e, t) {
|
||||||
return Object(r["a"])({
|
return Object(r["a"])({
|
||||||
url: e,
|
url: e,
|
||||||
method: "delete",
|
method: "post",
|
||||||
params: t
|
params: t
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -10407,7 +10407,7 @@
|
|||||||
},
|
},
|
||||||
edit: function(e, t) {
|
edit: function(e, t) {
|
||||||
var that = this;
|
var that = this;
|
||||||
this.titleText = "编辑", this.uiSchema.method = "put", this.uiSchema.formTemplate = e, this.uiSchema.url =
|
this.titleText = "编辑", this.uiSchema.method = "post", this.uiSchema.formTemplate = e, this.uiSchema.url =
|
||||||
this.url.optPre + this.code, this.uiSchema = c({}, this.uiSchema), this.visible = !0, this.disableSubmit = !
|
this.url.optPre + this.code, this.uiSchema = c({}, this.uiSchema), this.visible = !0, this.disableSubmit = !
|
||||||
1, Object(o["c"])(this.url.optPre + this.code + "/" + t).then((function(e) {
|
1, Object(o["c"])(this.url.optPre + this.code + "/" + t).then((function(e) {
|
||||||
if (e.success) {
|
if (e.success) {
|
||||||
@@ -11122,9 +11122,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
r.forEach(["delete", "get", "head"], (function(e) {
|
r.forEach(["post", "get", "head"], (function(e) {
|
||||||
c.headers[e] = {}
|
c.headers[e] = {}
|
||||||
})), r.forEach(["post", "put", "patch"], (function(e) {
|
})), r.forEach(["post", "patch"], (function(e) {
|
||||||
c.headers[e] = r.merge(i)
|
c.headers[e] = r.merge(i)
|
||||||
})), e.exports = c
|
})), e.exports = c
|
||||||
}).call(this, n("f28c"))
|
}).call(this, n("f28c"))
|
||||||
@@ -11639,7 +11639,7 @@
|
|||||||
while (1) switch (e.prev = e.next) {
|
while (1) switch (e.prev = e.next) {
|
||||||
case 0:
|
case 0:
|
||||||
return a = "/sys/fillRule/executeRuleByCode/".concat(t), i = {}, "function" === typeof r && (i = r()),
|
return a = "/sys/fillRule/executeRuleByCode/".concat(t), i = {}, "function" === typeof r && (i = r()),
|
||||||
e.next = 5, Object(_api_manage__WEBPACK_IMPORTED_MODULE_5__["e"])(a, i, "PUT");
|
e.next = 5, Object(_api_manage__WEBPACK_IMPORTED_MODULE_5__["e"])(a, i, "POST");
|
||||||
case 5:
|
case 5:
|
||||||
if (o = e.sent, s = o.success, c = o.message, l = o.result, !s) {
|
if (o = e.sent, s = o.success, c = o.message, l = o.result, !s) {
|
||||||
e.next = 13;
|
e.next = 13;
|
||||||
@@ -20330,7 +20330,7 @@
|
|||||||
e.single = 1 == t.result.head.tableType;
|
e.single = 1 == t.result.head.tableType;
|
||||||
var n = {
|
var n = {
|
||||||
formTemplate: t.result.head.formTemplate,
|
formTemplate: t.result.head.formTemplate,
|
||||||
method: "put",
|
method: "post",
|
||||||
url: e.url.optPre + t.result.head.id
|
url: e.url.optPre + t.result.head.id
|
||||||
};
|
};
|
||||||
e.schema = Object.assign({}, t.result.schema, n);
|
e.schema = Object.assign({}, t.result.schema, n);
|
||||||
@@ -24110,7 +24110,7 @@
|
|||||||
tab: "报表参数",
|
tab: "报表参数",
|
||||||
forceRender: !0
|
forceRender: !0
|
||||||
}
|
}
|
||||||
}, [n("report-paramj-table", {
|
}, [n("report-params-table", {
|
||||||
ref: "table2",
|
ref: "table2",
|
||||||
attrs: {
|
attrs: {
|
||||||
loading: e.confirmLoading,
|
loading: e.confirmLoading,
|
||||||
@@ -24352,7 +24352,7 @@
|
|||||||
var t = this,
|
var t = this,
|
||||||
n = "post",
|
n = "post",
|
||||||
r = this.url.add;
|
r = this.url.add;
|
||||||
this.model.id && (n = "put", r = this.url.edit), this.confirmLoading = !0, Object(s["e"])(r, e, n).then((
|
this.model.id && (r = this.url.edit), this.confirmLoading = !0, Object(s["e"])(r, e, n).then((
|
||||||
function(e) {
|
function(e) {
|
||||||
e.success ? (t.$message.success(e.message), t.$emit("ok"), t.close()) : t.$message.warning(e.message)
|
e.success ? (t.$message.success(e.message), t.$emit("ok"), t.close()) : t.$message.warning(e.message)
|
||||||
})).finally((function() {
|
})).finally((function() {
|
||||||
@@ -29134,7 +29134,7 @@
|
|||||||
e.exports = function(e) {
|
e.exports = function(e) {
|
||||||
l(e), e.baseURL && !s(e.url) && (e.url = c(e.baseURL, e.url)), e.headers = e.headers || {}, e.data = a(e.data,
|
l(e), e.baseURL && !s(e.url) && (e.url = c(e.baseURL, e.url)), e.headers = e.headers || {}, e.data = a(e.data,
|
||||||
e.headers, e.transformRequest), e.headers = r.merge(e.headers.common || {}, e.headers[e.method] || {}, e.headers ||
|
e.headers, e.transformRequest), e.headers = r.merge(e.headers.common || {}, e.headers[e.method] || {}, e.headers ||
|
||||||
{}), r.forEach(["delete", "get", "head", "post", "put", "patch", "common"], (function(t) {
|
{}), r.forEach(["get", "head", "post", "patch", "common"], (function(t) {
|
||||||
delete e.headers[t]
|
delete e.headers[t]
|
||||||
}));
|
}));
|
||||||
var t = e.adapter || o.adapter;
|
var t = e.adapter || o.adapter;
|
||||||
@@ -34058,7 +34058,7 @@
|
|||||||
e.head && e.head.tableName && (e.head.tableName = e.head.tableName.toLowerCase().trim());
|
e.head && e.head.tableName && (e.head.tableName = e.head.tableName.toLowerCase().trim());
|
||||||
var i = "post",
|
var i = "post",
|
||||||
o = this.url.addAll;
|
o = this.url.addAll;
|
||||||
this.model.id && (i = "put", o = this.url.editAll), Object(p["e"])(o, e, i).then((function(n) {
|
this.model.id && (o = this.url.editAll), Object(p["e"])(o, e, i).then((function(n) {
|
||||||
n.success ? (t.refreshCacheTableName(t.metaTableName, e.head["tableName"]), t.$message.success(n.message),
|
n.success ? (t.refreshCacheTableName(t.metaTableName, e.head["tableName"]), t.$message.success(n.message),
|
||||||
t.$emit("ok"), t.close()) : t.$message.warning(n.message)
|
t.$emit("ok"), t.close()) : t.$message.warning(n.message)
|
||||||
})).finally((function() {
|
})).finally((function() {
|
||||||
@@ -37496,8 +37496,8 @@
|
|||||||
if (!n) {
|
if (!n) {
|
||||||
t.confirmLoading = !0;
|
t.confirmLoading = !0;
|
||||||
var a = "",
|
var a = "",
|
||||||
o = "";
|
o = "post";
|
||||||
e.model.id ? (a += e.url.edit, o = "put") : (a += e.url.add, o = "post");
|
e.model.id ? (a += e.url.edit) : (a += e.url.add);
|
||||||
var s = Object.assign(e.model, r);
|
var s = Object.assign(e.model, r);
|
||||||
s.cgformHeadId = e.code, Object(i["e"])(a, s, o).then((function(e) {
|
s.cgformHeadId = e.code, Object(i["e"])(a, s, o).then((function(e) {
|
||||||
e.success ? (t.$message.success(e.message), t.$emit("ok")) : t.$message.warning(e.message)
|
e.success ? (t.$message.success(e.message), t.$emit("ok")) : t.$message.warning(e.message)
|
||||||
@@ -40153,7 +40153,7 @@
|
|||||||
},
|
},
|
||||||
edit: function(e, t) {
|
edit: function(e, t) {
|
||||||
var n = this;
|
var n = this;
|
||||||
this.titleText = "编辑", this.uiSchema.method = "put", this.uiSchema.formTemplate = e, this.uiSchema.url =
|
this.titleText = "编辑", this.uiSchema.method = "post", this.uiSchema.formTemplate = e, this.uiSchema.url =
|
||||||
this.urls.optPre + this.code, this.uiSchema = v({}, this.uiSchema), this.visible = !0, this.disableSubmit = !
|
this.urls.optPre + this.code, this.uiSchema = v({}, this.uiSchema), this.visible = !0, this.disableSubmit = !
|
||||||
1, Object(i["c"])(this.urls.optPre + this.code + "/" + t).then((function(e) {
|
1, Object(i["c"])(this.urls.optPre + this.code + "/" + t).then((function(e) {
|
||||||
if (e.success) {
|
if (e.success) {
|
||||||
@@ -73614,7 +73614,7 @@
|
|||||||
},
|
},
|
||||||
edit: function(e, t) {
|
edit: function(e, t) {
|
||||||
var n = this;
|
var n = this;
|
||||||
this.titleText = "编辑", this.uiSchema.method = "put", this.uiSchema.formTemplate = e, this.uiSchema.url =
|
this.titleText = "编辑", this.uiSchema.method = "post", this.uiSchema.formTemplate = e, this.uiSchema.url =
|
||||||
this.url.optPre + this.code, this.uiSchema = c({}, this.uiSchema), this.visible = !0, this.disableSubmit = !
|
this.url.optPre + this.code, this.uiSchema = c({}, this.uiSchema), this.visible = !0, this.disableSubmit = !
|
||||||
1, Object(o["c"])(this.url.optPre + this.code + "/" + t).then((function(e) {
|
1, Object(o["c"])(this.url.optPre + this.code + "/" + t).then((function(e) {
|
||||||
if (e.success) {
|
if (e.success) {
|
||||||
|
|||||||
Reference in New Issue
Block a user