From 8436ec13ba28c0bc979be149ff1aa79eb6324fff Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 02 四月 2022 12:07:00 +0800
Subject: [PATCH] 2022-04-02
---
public/options.json | 14 +++++++-------
src/index.js | 2 +-
src/tabviews/custom/components/form/tab-form/index.jsx | 6 ++++++
src/menu/components/form/dragtitle/options.jsx | 2 +-
public/README.txt | 2 +-
src/tabviews/custom/components/form/normal-form/index.jsx | 6 ++++++
6 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/public/README.txt b/public/README.txt
index 70fe1db..4008b9e 100644
--- a/public/README.txt
+++ b/public/README.txt
@@ -6,7 +6,7 @@
systemType -- 绯荤粺绫诲瀷锛屾寮忕郴缁熸槸濉玴roduction锛屽紑鍙戠郴缁熶负绌猴紝寮�鍙戠郴缁熶細鏈変竴閮ㄥ垎鐨勬暟鎹ā绯婂寲
externalDatabase -- 澶栬仈搴擄紝涓嶄娇鐢ㄦ椂榛樿涓篺alse
lineColor -- 鐧诲綍椤靛垎鍓茬嚎棰滆壊
-filter -- 椤甸潰婊ら暅锛屽�间负'true'鏃讹紝椤甸潰鏄剧ず涓洪粦鐧借壊
+filter -- 椤甸潰婊ら暅锛屽�间负'true'鏃讹紝椤甸潰鏄剧ず涓洪粦鐧借壊锛涘綋璁剧疆涓烘棩鏈熸椂锛圷YYY-MM-DD锛夛紝鎴鍒板綋鍓嶆棩鏈燂紝椤甸潰鏄剧ず涓洪粦鐧借壊
defaultApp -- 榛樿搴旂敤锛岀郴缁熼粯璁ゆ墦寮�鏌愪釜瀛愬簲鐢ㄦ椂闇�濉啓搴旂敤缂栫爜
defaultLang -- 鎵撳紑鐨勫瓙搴旂敤璇█绫诲瀷锛岄粯璁や负zh-CN
WXAppID -- 浣跨敤鍏紬鍙锋椂锛岀粦瀹氱殑鍏紬鍙稩D
diff --git a/public/options.json b/public/options.json
index f317ad5..792a858 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,17 +1,17 @@
{
- "appId": "201912040924165801464FF1788654BC5AC73",
- "appkey": "20191106103859640976D6E924E464D029CF0",
+ "appId": "202108312122504607B107A83F55B40C98CCF",
+ "appkey": "20210831212235413F287EC3BF489424496C8",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "mk",
+ "defaultApp": "mkindustry",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "",
- "probation": "",
- "host": "http://qingqiumarket.cn",
- "service": "MKWMS/"
+ "licenseKey": "7EFE13KIKLILIJB64C12",
+ "probation": "2021-12-31",
+ "host": "http://demo.mk9h.cn",
+ "service": "erp_new/"
}
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index bb2bff3..e628a1b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -177,7 +177,7 @@
document.title = GLOB.platTitle || ''
- if (config.filter === 'true') {
+ if (config.filter === 'true' || (/^20\d{2}-\d{2}-\d{2}$/.test(config.filter) && new Date(config.filter).getTime() + 86400000 >= new Date().getTime())) {
let html = document.getElementsByTagName('html')[0]
if (html) {
diff --git a/src/menu/components/form/dragtitle/options.jsx b/src/menu/components/form/dragtitle/options.jsx
index 90f9176..39849e5 100644
--- a/src/menu/components/form/dragtitle/options.jsx
+++ b/src/menu/components/form/dragtitle/options.jsx
@@ -7,7 +7,7 @@
if (appType === 'mob') {
group.fields.forEach(f => {
- if (f.field && ['text', 'number'].includes(f.type) && f.hidden !== 'true' && f.readonly !== 'true') {
+ if (f.field && ['select', 'text', 'number'].includes(f.type) && f.hidden !== 'true' && f.readonly !== 'true') {
fields.push(f)
}
})
diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index 84e9b94..1fdc49f 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -76,6 +76,12 @@
group.subButton.OpenType = 'formSubmit'
group.subButton.execError = 'never'
+ group.subButton.syncComponentId = group.subButton.syncComponent ? group.subButton.syncComponent.pop() : ''
+
+ if (group.subButton.syncComponentId === config.uuid) {
+ group.subButton.syncComponentId = ''
+ }
+
if (group.subButton.enable === 'false') {
group.subButton.style.display = 'none'
}
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 45433e2..a3f9f60 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -75,6 +75,12 @@
group.subButton.OpenType = 'formSubmit'
group.subButton.execError = 'never'
+ group.subButton.syncComponentId = group.subButton.syncComponent ? group.subButton.syncComponent.pop() : ''
+
+ if (group.subButton.syncComponentId === config.uuid) {
+ group.subButton.syncComponentId = ''
+ }
+
if (group.subButton.enable === 'false') {
group.subButton.style.display = 'none'
group.$button = 'no-button'
--
Gitblit v1.8.0