Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

Junjie

2024-03-25 c4c29d91cccfccf457594b87d09c0181f8810ba2

 zy-asrs-flow/src/pages/map/components/configSettings.jsx

@@ -94,7 +94,8 @@
        // execute where the form was finished
        const confirmSettings = () => {
            if (curSprite && curSprite?.data?.type) {
                curSprite.data = { ...curSprite.data, ...values }
                curSprite.data = { ...curSprite.data, ...values };
                Utils.showSheflType(curSprite);
            }
            message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '操作成功' }));
        }
@@ -200,15 +201,15 @@
                                options={[
                                    {
                                        label: intl.formatMessage({ id: 'map.settings.shelf.store', defaultMessage: '库位' }),
                                        value: 0
                                        value: Utils.SHELF_TYPE.STORE
                                    },
                                    {
                                        label: intl.formatMessage({ id: 'map.settings.shelf.track', defaultMessage: '轨道' }),
                                        value: 3
                                        value: Utils.SHELF_TYPE.TRACK
                                    },
                                    {
                                        label: intl.formatMessage({ id: 'map.settings.shelf.diable', defaultMessage: '禁用' }),
                                        value: 1
                                        value: Utils.SHELF_TYPE.DISABLE
                                    },
                                ]}
                                defaultValue={0}