From 423ca1c5d4e4cc7eba9e12125e74f47f5756f967 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 六月 2021 17:29:59 +0800
Subject: [PATCH] 2021-06-24
---
src/utils/utils.js | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 1625ae6..2687da4 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -702,7 +702,10 @@
arrfield.push(...item.linkSubField)
} else if (item.type === 'checkcard') {
arrfield = item.fields.map(f => f.field)
- arrfield.push(item.valueField)
+ arrfield.push(item.cardValField)
+ if (item.urlField) {
+ arrfield.push(item.urlField)
+ }
}
arrfield = Array.from(new Set(arrfield))
@@ -1057,7 +1060,7 @@
* @return {Object} tab 鏍囩淇℃伅
* @return {Boolean} retmsg 鏄惁闇�瑕佹暟鎹繑鍥�
*/
-export function getSysDefaultSql (btn, setting, formdata, param, data, columns, tab, retmsg = false, moduleParams) {
+export function getSysDefaultSql (btn, setting, formdata, param, data, columns, tab, retmsg = false, moduleParams, getOptions) {
let primaryId = param.ID
let BID = param.BID
let verify = btn.verify || {}
@@ -1157,7 +1160,7 @@
}
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
- if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
+ if (data && !btn.$forbid && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
datavars = {...data, ...datavars}
const setField = (col) => {
@@ -1299,8 +1302,8 @@
datasource = '(' + datasource + ') tb'
}
- if (setting.queryType === 'statistics' || customScript) {
- let allSearch = this.getAllSearchOptions(search)
+ if (getOptions && (setting.queryType === 'statistics' || customScript)) {
+ let allSearch = getOptions(search)
let regoptions = allSearch.map(item => {
return {
@@ -1754,6 +1757,46 @@
}
/**
+ * @description 鐢熸垚鏇挎崲鍑芥暟鍒楄〃
+ */
+export function setGLOBFuncs () {
+ window.GLOB.funcs = []
+ if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
+ return
+ }
+
+ if (window.GLOB.WebSql) {
+ window.GLOB.WebSql.transaction(tx => {
+ tx.executeSql("SELECT * FROM FUNCS", [], (tx, results) => {
+ let rows = results.rows
+ if (!rows || rows.length === 0) return
+ for (let i = 0; i < rows.length; i++) {
+ window.GLOB.funcs.push({
+ func_code: rows[i].func_code,
+ key_sql: window.decodeURIComponent(window.atob(rows[i].key_sql))
+ })
+ }
+ })
+ })
+ } else {
+ let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
+
+ objectStore.openCursor().onsuccess = (event) => {
+ let cursor = event.target.result
+
+ if (cursor) {
+ window.GLOB.funcs.push({
+ func_code: cursor.value.func_code,
+ key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
+ })
+ cursor.continue()
+ }
+ }
+ }
+
+}
+
+/**
* @description 鍒涘缓瀛樺偍杩囩▼绫�
*/
export class FuncUtils {
--
Gitblit v1.8.0