fix: 620/617 (#621)

fix
alibaba · Jan 18, 2020 · 6ca8809 · 6ca8809
1 parent 1ff5f8b
commit 6ca8809
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/packages/antd/src/fields/date.tsx b/packages/antd/src/fields/date.tsx
@@ -24,22 +24,20 @@ const transformMoment = (value, format = 'YYYY-MM-DD HH:mm:ss') => {
 }
 
 const mapMomentValue = props => {
-  const { value, showTime = false, disabled = false } = props
+  const { value, showTime = false } = props
   try {
-    if (!disabled) {
-      if (isStr(value) && value) {
-        props.value = moment(
-          value,
-          showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'
-        )
-      } else if (isArr(value) && value.length) {
-        props.value = value.map(
-          item =>
-            (item &&
-              moment(item, showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')) ||
-            ''
-        )
-      }
+    if (isStr(value) && value) {
+      props.value = moment(
+        value,
+        showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'
+      )
+    } else if (isArr(value) && value.length) {
+      props.value = value.map(
+        item =>
+          (item &&
+            moment(item, showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')) ||
+          ''
+      )
     }
   } catch (e) {
     throw new Error(e)

diff --git a/packages/antd/src/fields/table.tsx b/packages/antd/src/fields/table.tsx
@@ -42,6 +42,7 @@ const FormTableField = styled(
       renderMoveUp,
       renderEmpty,
       renderExtraOperations,
+      operationsWidth,
       operations,
       dragable,
       ...componentProps
@@ -90,6 +91,7 @@ const FormTableField = styled(
         ...operations,
         key: 'operations',
         dataIndex: 'operations',
+        width: operationsWidth || 200,
         render: (value: any, record: any, index: number) => {
           return (
             <Form.Item>

diff --git a/packages/next/src/fields/table.tsx b/packages/next/src/fields/table.tsx
@@ -189,7 +189,7 @@ const FormTableField = styled(
               }, [])
             : renderColumns(schema.items)}
           <ArrayList.Item
-            width={200}
+            width={operationsWidth || 200}
             lock="right"
             {...operations}
             key="operations"