From b7a4f1a69dd742eb5f40315419e6f8a71d2c518e Mon Sep 17 00:00:00 2001
From: anyi <742142482@qq.com>
Date: Tue, 13 Aug 2024 14:56:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=20=E5=BF=85=E5=A1=AB=20=E9=9A=90=E8=97=8F=E7=9A=84=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkForm/Design/form/formItem.tsx         | 190 ++++++++++--------
 1 file changed, 104 insertions(+), 86 deletions(-)

diff --git a/src/components/DataStandard/WorkForm/Design/form/formItem.tsx b/src/components/DataStandard/WorkForm/Design/form/formItem.tsx
index 59013c457..6ad8882bb 100644
--- a/src/components/DataStandard/WorkForm/Design/form/formItem.tsx
+++ b/src/components/DataStandard/WorkForm/Design/form/formItem.tsx
@@ -85,99 +85,117 @@ export const FormItem: React.FC<{
     labelMode: 'floating',
     labelLocation: 'left',
     ...attribute.options,
-    visible: attribute.options?.hideField !== true,
   };
   if (attribute.options?.isRequired) {
     mixOptions.label = mixOptions.label + '*';
+    mixOptions.className = 'formItemRequired';
   }
 
-  switch (getWidget(attribute.property?.valueType, attribute.widget)) {
-    case '数字框':
-      return <NumberBox {...mixOptions} />;
-    case '文本框':
-      return <TextBox {...mixOptions} />;
-    case '多行文本框':
-      return <TextArea {...mixOptions} minHeight={100} autoResizeEnabled />;
-    case '富文本框':
-      return <HtmlEditItem {...mixOptions} />;
-    case '单选框':
-      return (
-        <SelectBox
-          {...mixOptions}
-          searchMode="contains"
-          searchExpr={'name'}
-          dataSource={items}
-          displayExpr={'name'}
-          valueExpr={'id'}
-        />
-      );
-    case '多选框':
-      return (
-        <DropDownBox
-          {...mixOptions}
-          value={treeBoxValue}
-          valueExpr="id"
-          displayExpr="name"
-          dataSource={items}
-          onValueChanged={syncTreeViewSelection}
-          contentRender={() => {
-            return (
-              <TreeView
-                ref={treeViewRef}
-                dataSource={items}
-                dataStructure="plain"
-                keyExpr="id"
-                selectionMode="multiple"
-                showCheckBoxesMode="normal"
-                selectNodesRecursive={false}
-                displayExpr="name"
-                selectByClick={true}
-                onContentReady={syncTreeViewSelection}
-                onItemSelectionChanged={(e) => {
-                  const nodes = e.component.getSelectedNodes();
-                  setTreeBoxValue(nodes.map((node) => node.key));
-                }}
-              />
-            );
+  const formCount = () => {
+    switch (getWidget(attribute.property?.valueType, attribute.widget)) {
+      case '数字框':
+        return <NumberBox {...mixOptions} />;
+      case '文本框':
+        return <TextBox {...mixOptions} />;
+      case '多行文本框':
+        return <TextArea {...mixOptions} minHeight={100} autoResizeEnabled />;
+      case '富文本框':
+        return <HtmlEditItem {...mixOptions} />;
+      case '单选框':
+        return (
+          <SelectBox
+            {...mixOptions}
+            searchMode="contains"
+            searchExpr={'name'}
+            dataSource={items}
+            displayExpr={'name'}
+            valueExpr={'id'}
+          />
+        );
+      case '多选框':
+        return (
+          <DropDownBox
+            {...mixOptions}
+            value={treeBoxValue}
+            valueExpr="id"
+            displayExpr="name"
+            dataSource={items}
+            onValueChanged={syncTreeViewSelection}
+            contentRender={() => {
+              return (
+                <TreeView
+                  ref={treeViewRef}
+                  dataSource={items}
+                  dataStructure="plain"
+                  keyExpr="id"
+                  selectionMode="multiple"
+                  showCheckBoxesMode="normal"
+                  selectNodesRecursive={false}
+                  displayExpr="name"
+                  selectByClick={true}
+                  onContentReady={syncTreeViewSelection}
+                  onItemSelectionChanged={(e) => {
+                    const nodes = e.component.getSelectedNodes();
+                    setTreeBoxValue(nodes.map((node) => node.key));
+                  }}
+                />
+              );
+            }}
+          />
+        );
+      case '引用选择框':
+        return (
+          <DataBox
+            {...mixOptions}
+            attributes={current.attributes}
+            field={attr}
+            target={target}
+          />
+        );
+      case '多级选择框':
+        return <TreeSelectItem {...mixOptions} speciesItems={items} />;
+      case '操作人':
+        return <CurrentTargetItem {...mixOptions} target={target.user.metadata} />;
+      case '操作组织':
+        return <CurrentTargetItem {...mixOptions} target={target.space.metadata} />;
+      case '人员搜索框':
+        return <SearchTargetItem {...mixOptions} typeName={TargetType.Person} />;
+      case '单位搜索框':
+        return <SearchTargetItem {...mixOptions} typeName={TargetType.Company} />;
+      case '群组搜索框':
+        return <SearchTargetItem {...mixOptions} typeName={TargetType.Cohort} />;
+      case '组织群搜索框':
+        return <SearchTargetItem {...mixOptions} typeName={TargetType.Group} />;
+      case '成员选择框':
+        return <MemberBoxProps {...mixOptions} target={target.space.metadata} />;
+      case '内部机构选择框':
+        return <DepartmentBox {...mixOptions} target={target.space.metadata} />;
+      case '日期选择框':
+        return <DateBox {...mixOptions} type={'date'} />;
+      case '时间选择框':
+        return <DateBox {...mixOptions} type={'datetime'} />;
+      case '文件选择框':
+        return <SelectFilesItem {...mixOptions} />;
+      default:
+        return <TextArea {...mixOptions} />;
+    }
+  };
+  return (
+    <div style={{ position: 'relative' }}>
+      {formCount()}
+      {attribute.options?.hideField && (
+        <div
+          style={{
+            borderBottom: '1px solid rgba(0,0,0,.45)',
+            position: 'absolute',
+            bottom: 18,
+            zIndex: 2,
+            width: '100%',
           }}
         />
-      );
-    case '引用选择框':
-      return (
-        <DataBox
-          {...mixOptions}
-          attributes={current.attributes}
-          field={attr}
-          target={target}
-        />
-      );
-    case '多级选择框':
-      return <TreeSelectItem {...mixOptions} speciesItems={items} />;
-    case '操作人':
-      return <CurrentTargetItem {...mixOptions} target={target.user.metadata} />;
-    case '操作组织':
-      return <CurrentTargetItem {...mixOptions} target={target.space.metadata} />;
-    case '人员搜索框':
-      return <SearchTargetItem {...mixOptions} typeName={TargetType.Person} />;
-    case '单位搜索框':
-      return <SearchTargetItem {...mixOptions} typeName={TargetType.Company} />;
-    case '群组搜索框':
-      return <SearchTargetItem {...mixOptions} typeName={TargetType.Cohort} />;
-    case '组织群搜索框':
-      return <SearchTargetItem {...mixOptions} typeName={TargetType.Group} />;
-    case '成员选择框':
-      return <MemberBoxProps {...mixOptions} target={target.space.metadata} />;
-    case '内部机构选择框':
-      return <DepartmentBox {...mixOptions} target={target.space.metadata} />;
-    case '日期选择框':
-      return <DateBox {...mixOptions} type={'date'} />;
-    case '时间选择框':
-      return <DateBox {...mixOptions} type={'datetime'} />;
-    case '文件选择框':
-      return <SelectFilesItem {...mixOptions} />;
-    default:
-      return <TextArea {...mixOptions} />;
-  }
+      )}
+    </div>
+  );
 };
 
 export default FormItem;
-- 
Gitee


From f9ff32416f0e1275329edb213704fecaf85ca504 Mon Sep 17 00:00:00 2001
From: anyi <742142482@qq.com>
Date: Tue, 27 Aug 2024 13:57:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=9A=90=E8=97=8F=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataStandard/WorkForm/Design/form/formItem.tsx  | 13 ++-----------
 .../WorkForm/Design/form/index.module.less          | 13 +++++++++++++
 src/ts/core/work/index.ts                           |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/components/DataStandard/WorkForm/Design/form/formItem.tsx b/src/components/DataStandard/WorkForm/Design/form/formItem.tsx
index 6ad8882bb..c341d18a8 100644
--- a/src/components/DataStandard/WorkForm/Design/form/formItem.tsx
+++ b/src/components/DataStandard/WorkForm/Design/form/formItem.tsx
@@ -21,6 +21,7 @@ import {
 } from 'devextreme-react';
 import React, { useEffect, useState, createRef, useCallback } from 'react';
 import { DropDownBoxTypes } from 'devextreme-react/drop-down-box';
+import styles from './index.module.less';
 
 export const FormItem: React.FC<{
   current: IForm;
@@ -183,17 +184,7 @@ export const FormItem: React.FC<{
   return (
     <div style={{ position: 'relative' }}>
       {formCount()}
-      {attribute.options?.hideField && (
-        <div
-          style={{
-            borderBottom: '1px solid rgba(0,0,0,.45)',
-            position: 'absolute',
-            bottom: 18,
-            zIndex: 2,
-            width: '100%',
-          }}
-        />
-      )}
+      {attribute.options?.hideField && <div className={styles.gradient}></div>}
     </div>
   );
 };
diff --git a/src/components/DataStandard/WorkForm/Design/form/index.module.less b/src/components/DataStandard/WorkForm/Design/form/index.module.less
index 0c8a009f1..22941c46c 100644
--- a/src/components/DataStandard/WorkForm/Design/form/index.module.less
+++ b/src/components/DataStandard/WorkForm/Design/form/index.module.less
@@ -22,4 +22,17 @@
             flex-wrap: wrap;
         }
     }
+}
+.gradient{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 36px;
+    background: linear-gradient(
+          45deg, 
+          rgba(0, 0, 0, .5) 0, rgba(0, 0, 0, .5) 25%, transparent 25%, transparent 50%, 
+          rgba(0, 0, 0, .5) 50%, rgba(0, 0, 0, .5) 75%, transparent 75%, transparent
+        );
+    background-size: 6px 6px;
 }
\ No newline at end of file
diff --git a/src/ts/core/work/index.ts b/src/ts/core/work/index.ts
index 5fbdaca94..2ca296297 100644
--- a/src/ts/core/work/index.ts
+++ b/src/ts/core/work/index.ts
@@ -576,8 +576,8 @@ export class Work extends FileInfo<schema.XWorkDefine> implements IWork {
       a[v.id] = v;
       return a;
     }, {});
-    node.detailForms = _.orderBy(node.detailForms, (a) => formMap[a.id].order);
-    node.primaryForms = _.orderBy(node.primaryForms, (a) => formMap[a.id].order);
+    node.detailForms = _.orderBy(node.detailForms, (a) => formMap?.[a.id]?.order);
+    node.primaryForms = _.orderBy(node.primaryForms, (a) => formMap?.[a.id]?.order);
     node.primaryPrints = await this.directory.resource.printColl.find(
       node.print?.map((s) => s.id),
     );
-- 
Gitee