From 34f4be5727bf4d0d231e0691a503cf0c9e5d00d3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 一月 2021 19:10:56 +0800
Subject: [PATCH] 2021-01-27
---
src/tabviews/subtabtable/index.jsx | 72 +++---------------------------------
1 files changed, 6 insertions(+), 66 deletions(-)
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index 3e98a32..1e7b4bd 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -10,7 +10,7 @@
import Utils from '@/utils/utils.js'
import options from '@/store/options.js'
import UtilsDM from '@/utils/utils-datamanage.js'
-import UtilsUpdate from '@/utils/utils-update.js'
+import { updateSubTable } from '@/utils/utils-update.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import NotFount from '@/components/404'
@@ -111,7 +111,7 @@
let absFields = [] // 缁濆鍊煎瓧娈�
// 鐗堟湰鍏煎
- config = UtilsUpdate.updateSubTable(config)
+ config = updateSubTable(config)
// 涓嶆敮鎸乫uncbutton銆乸opview 绫诲瀷鎸夐挳
let labels = []
@@ -455,9 +455,6 @@
customCallbackRequest = (result) => {
const { setting } = this.state
- let lines = []
- let pre = setting.callbackType === 'script' ? '@' : ''
-
let errSql = ''
if (result.$ErrCode === 'E') {
errSql = `
@@ -468,68 +465,11 @@
delete result.$ErrMesg
}
- let getDefaultSql = (obj, tb, bid, level) => {
- let keys = []
- let vals = []
- let subObjs = []
- let id = Utils.getuuid()
-
- delete obj.$$key
-
- Object.keys(obj).forEach(key => {
- let val = obj[key]
- if (val === null || val === undefined) return
- if (typeof(val) === 'object') {
- if (Array.isArray(val)) {
- val.forEach(item => {
- if (typeof(item) !== 'object' || Array.isArray(item)) return
- if (Object.keys(item).length > 0) {
- item.$$key = tb + '_' + key
- subObjs.push(item)
- }
- })
- } else if (Object.keys(val).length > 0) {
- val.$$key = tb + '_' + key
- subObjs.push(val)
- }
- } else {
- keys.push(key)
- vals.push(`'${val}'`)
- }
- })
-
- lines.push({
- table: tb,
- insert: `Insert into ${pre}${tb} (${keys.join(',')},mk_level,mk_id,mk_bid)`,
- select: `Select ${vals.join(',')},'${level}','${id}','${bid}'`
- })
-
- subObjs.forEach(item => {
- getDefaultSql(item, item.$$key, id, level + 1)
- })
- }
-
- getDefaultSql(result, setting.cbTable, '', 1)
-
- let lineMap = new Map()
- lines.forEach(line => {
- if (lineMap.has(line.table)) {
- let _line = lineMap.get(line.table)
- _line.selects.push(line.select)
- lineMap.set(line.table, _line)
- } else {
- lineMap.set(line.table, {
- table: line.table,
- insert: line.insert,
- selects: [line.select]
- })
- }
- })
-
+ let lines = UtilsDM.getCallBackSql(setting, result)
let param = {}
if (setting.callbackType === 'script') { // 浣跨敤鑷畾涔夎剼鏈�
- let sql = [...lineMap.values()].map(item => (`
+ let sql = lines.map(item => (`
${item.insert}
${item.selects.join(` union all
`)}
@@ -548,7 +488,7 @@
} else {
let name = this.props.Tab ? (this.props.Tab.label || '') : ''
param.func = 's_ex_result_back'
- param.s_ex_result = [...lineMap.values()].map((item, index) => ({
+ param.s_ex_result = lines.map((item, index) => ({
MenuID: this.props.MenuID,
MenuName: name,
TableName: item.table,
@@ -557,7 +497,7 @@
}))
if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
- let sql = [...lineMap.values()].map(item => (`
+ let sql = lines.map(item => (`
${item.insert}
${item.selects.join(` union all
`)}
--
Gitblit v1.8.0