fix: 处理计划送货相关页面高级筛选排序问题

src/pages/order/deliveryPlanCollaboration/deliveryPlanAwait/schema/index.tsx

@@ -12,28 +12,13 @@ export const deliveryPlanCollaborationAwaitSchema: ISchema = {
       type: 'object',
       'x-component': 'mega-layout',
       properties: {
-        topLayout: {
-          type: 'object',
-          'x-component': 'mega-layout',
+        planCode: {
+          type: 'string',
+          'x-component': 'Search',
           'x-component-props': {
-            grid: true,
-          },
-          properties: {
-            ctl: {
-              type: 'object',
-              'x-component': 'Children',
-              'x-component-props': {
-                children: '{{controllerBtns}}',
-              },
-            },
-            planCode: {
-              type: 'string',
-              'x-component': 'Search',
-              'x-component-props': {
-                allowClear: true,
-                placeholder: '请输入计划编号查询'
-              },
-            },
+            allowClear: true,
+            align: 'flex-left',
+            placeholder: '请输入计划编号查询'
           },
         },
         [FORM_FILTER_PATH]: {
@@ -42,9 +27,10 @@ export const deliveryPlanCollaborationAwaitSchema: ISchema = {
           'x-component-props': {
             rowStyle: {
               flexWrap: 'nowrap',
+              justifyContent: 'flex-start',
             },
             colStyle: {
-              marginLeft: 20,
+              marginRight: 20,
             },
           },
           properties: {
@@ -76,4 +62,4 @@ export const deliveryPlanCollaborationAwaitSchema: ISchema = {
       }
     }
   }
-}
\ No newline at end of file
+}

src/pages/order/deliveryPlanCollaboration/deliveryPlanQuery/schema/index.tsx

@@ -12,28 +12,13 @@ export const deliveryPlanCollaborationQuerySchema: ISchema = {
       type: 'object',
       'x-component': 'mega-layout',
       properties: {
-        topLayout: {
-          type: 'object',
-          'x-component': 'mega-layout',
+        planNo: {
+          type: 'string',
+          'x-component': 'Search',
           'x-component-props': {
-            grid: true,
-          },
-          properties: {
-            ctl: {
-              type: 'object',
-              'x-component': 'Children',
-              'x-component-props': {
-                children: '{{controllerBtns}}',
-              },
-            },
-            planNo: {
-              type: 'string',
-              'x-component': 'Search',
-              'x-component-props': {
-                allowClear: true,
-                placeholder: '请输入计划编号查询'
-              },
-            },
+            allowClear: true,
+            align: 'flex-left',
+            placeholder: '请输入计划编号查询'
           },
         },
         [FORM_FILTER_PATH]: {
@@ -42,9 +27,10 @@ export const deliveryPlanCollaborationQuerySchema: ISchema = {
           'x-component-props': {
             rowStyle: {
               flexWrap: 'nowrap',
+              justifyContent: 'flex-start',
             },
             colStyle: {
-              marginLeft: 20,
+              marginRight: 20,
             },
           },
           properties: {
@@ -76,4 +62,4 @@ export const deliveryPlanCollaborationQuerySchema: ISchema = {
       }
     }
   }
-}
\ No newline at end of file
+}

src/pages/order/deliveryPlanManagement/deliveryPlanQuery/index.tsx

@@ -28,11 +28,6 @@ const DeliveryPlanManagementQuery: React.FC = () => {
   const ref = useRef<any>({})
   const formActions = createFormActions()
 
-  const controllerBtns = (
-    <Space>
-      {/* 杰哥说没有新增按钮 */}
-    </Space>
-  )
   const renderOptionButton = (record: any) => {
     const btnAuthOfOperationTextMap = {
       '查看': 'deliveryPlanManagement.looking',
@@ -108,9 +103,6 @@ const DeliveryPlanManagementQuery: React.FC = () => {
             <NiceForm
               actions={formActions}
               onSubmit={values => ref.current.reload(values)}
-              expressionScope={{
-                controllerBtns,
-              }}
               effects={($, actions) => {
                 useStateFilterSearchLinkageEffect(
                   $,
@@ -127,4 +119,4 @@ const DeliveryPlanManagementQuery: React.FC = () => {
     </PageHeaderWrapper>)
 }
 
-export default DeliveryPlanManagementQuery
\ No newline at end of file
+export default DeliveryPlanManagementQuery

src/pages/order/deliveryPlanManagement/deliveryPlanQuery/schema/index.tsx

@@ -12,28 +12,14 @@ export const deliveryPlanManagementQuerySchema: ISchema = {
       type: 'object',
       'x-component': 'mega-layout',
       properties: {
-        topLayout: {
-          type: 'object',
-          'x-component': 'mega-layout',
+        planNo: {
+          type: 'string',
+          'x-component': 'Search',
           'x-component-props': {
-            grid: true,
-          },
-          properties: {
-            ctl: {
-              type: 'object',
-              'x-component': 'Children',
-              'x-component-props': {
-                children: '{{controllerBtns}}',
-              },
-            },
-            planNo: {
-              type: 'string',
-              'x-component': 'Search',
-              'x-component-props': {
-                allowClear: true,
-                placeholder: '请输入计划编号查询'
-              },
-            },
+            allowClear: true,
+            align: 'flex-left',
+            placeholder: '请输入计划编号查询'
+
           },
         },
         [FORM_FILTER_PATH]: {
@@ -42,9 +28,10 @@ export const deliveryPlanManagementQuerySchema: ISchema = {
           'x-component-props': {
             rowStyle: {
               flexWrap: 'nowrap',
+              justifyContent: 'flex-start',
             },
             colStyle: {
-              marginLeft: 20,
+              marginRight: 20,
             },
           },
           properties: {