From 545231cc08e10b40011a581afb6be5f27e85ab52 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 19 八月 2022 17:12:06 +0800
Subject: [PATCH] 2022-08-19

---
 src/views/printTemplate/option.js       |    4 ++++
 src/api/index.js                        |    2 +-
 src/tabviews/zshare/topSearch/index.jsx |    8 ++++++--
 src/templates/zshare/formconfig.jsx     |   28 ++++++++++++++--------------
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 39c477c..e5b2885 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -811,7 +811,7 @@
     }
 
     let url = '/webapi/dostars'
-    if (param.rduri && /\/dostars/.test(param.rduri)) {
+    if (param.rduri && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') { // 鍒囨崲鐢ㄦ埛闇�瑕侀�氳繃鏈湴
       url = param.rduri
       delete param.rduri
     }
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 829e546..857e9f1 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -228,7 +228,7 @@
       advanceValues,
       searchlist: _list
     }, () => {
-      if (!window.GLOB.mkHS && options.sysType === 'local' && !window.GLOB.systemType) {
+      if (!window.GLOB.mkHS && options.sysType === 'local' && window.GLOB.systemType !== 'production') {
         this.improveSimpleSearch(deForms)
       } else {
         this.improveSearch(mainItems, localItems)
@@ -241,7 +241,7 @@
     const { BID } = this.props
     let deffers = []
 
-    if (!window.GLOB.mkHS && window.GLOB.systemType !== 'production') {
+    if (!window.GLOB.mkHS && options.sysType !== 'local') {
       localItems = [...localItems, ...mainItems]
       mainItems = []
     }
@@ -360,6 +360,10 @@
       param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
       param.secretkey = Utils.encrypt(param.LText, param.timestamp)
 
+      if (item.database === 'sso' && window.GLOB.mainSystemApi) {
+        param.rduri = window.GLOB.mainSystemApi
+      }
+
       return (
         new Promise(resolve => {
           setTimeout(() => {
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 0e784c6..b302e62 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -3068,6 +3068,19 @@
     },
     {
       type: 'radio',
+      key: 'hidden',
+      label: "闅愯棌",
+      initVal: card.hidden || 'false',
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
+    },
+    {
+      type: 'radio',
       key: 'readonly',
       label: '鍙',
       initVal: card.readonly || 'false',
@@ -3082,21 +3095,8 @@
     {
       type: 'radio',
       key: 'required',
-      label: Formdict['model.required'],
+      label: "蹇呭～",
       initVal: card.required || 'true',
-      options: [{
-        value: 'true',
-        text: Formdict['model.true']
-      }, {
-        value: 'false',
-        text: Formdict['model.false']
-      }]
-    },
-    {
-      type: 'radio',
-      key: 'hidden',
-      label: Formdict['model.hidden'],
-      initVal: card.hidden || 'false',
       options: [{
         value: 'true',
         text: Formdict['model.true']
diff --git a/src/views/printTemplate/option.js b/src/views/printTemplate/option.js
index 690ae65..1f57cf2 100644
--- a/src/views/printTemplate/option.js
+++ b/src/views/printTemplate/option.js
@@ -134,6 +134,10 @@
   {
     text: 'qrcode',
     value: 'qrcode'
+  },
+  {
+    text: 'datamatrix',
+    value: 'datamatrix'
   }
 ]
 

--
Gitblit v1.8.0