Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-system into v2

package.json

@@ -58,10 +58,11 @@
     "@antv/data-set": "^0.11.5",
     "@formily/antd": "^1.2.11",
     "@formily/antd-components": "^1.2.11",
-    "@lingxi-disign/core": "^1.0.6",
-    "@lingxi-disign/react": "^1.0.7",
-    "@lingxi-disign/react-web": "^1.0.2",
-    "@lingxi-disign/ui": "^1.0.6",
+    "@lingxi-disign/core": "^1.7.3",
+    "@lingxi-disign/react": "^1.7.6",
+    "@lingxi-disign/react-web": "^1.7.2",
+    "@lingxi-disign/ui": "^1.7.3",
+    "@lingxi-disign/utils": "^1.7.3",
     "@types/crypto-js": "^4.0.1",
     "@umijs/hooks": "^1.9.3",
     "@umijs/preset-react": "1.x",

src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/common/hooks/useGetData.tsx

 import { useEffect, useState } from 'react';
 import _sortBy from 'lodash/sortBy';
-import { updatePageConfig } from '@lingxi-disign/core';
+import { updatePageConfig } from '@lingxi-disign/react';
 import cloneDeep from 'lodash/cloneDeep';
 import { PublicApi } from '@/services/api';
 import { PostMarketingCouponPlatformActivityPageSelectDetailResponse } from '@/services/MaketingV2Api';

src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/common/hooks/useGetLayout.ts

 import React, { useEffect, useState } from 'react';
 import omit from 'lodash/omit';
-import { updatePageConfig } from '@lingxi-disign/core';
+import { updatePageConfig } from '@lingxi-disign/react';
 import DEFAULT_DATA from '../mock/index.json';
 import { GetTemplateWebActivityPageGetResponse } from '@/services/Template2Api';
 import { usePageStatus } from '@/hooks/usePageStatus';

src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/components/ComponentTree/index.tsx

 import React, { useMemo } from 'react';
-import { useSelector } from '@lingxi-disign/react';
-import { changeProps } from '@lingxi-disign/core';
+import { useSelector, changeProps } from '@lingxi-disign/react';
 import ComponentModule from './ComponentModule';
 import styles from './index.less';
 import attemptImg from '@/asserts/activity/attempt.png';

src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/components/EditPanel/editPanelForm.tsx

 import React, { useState, useEffect, useMemo } from 'react';
-import { changeProps, clearSelectedStatus, SelectedInfoType, STATE_PROPS } from '@lingxi-disign/core';
+import { changeProps, clearSelectedStatus, SelectedInfoType, STATE_PROPS } from '@lingxi-disign/react';
 import { useSelector } from '@lingxi-disign/react';
 import { PageConfigType } from '@lingxi-disign/utils';
 import cs from 'classnames';

src/pages/productManage/trademark/trademarkWillCheck/index.tsx

@@ -80,7 +80,7 @@ const Trademark: React.FC<{}> = () => {
       render: (text: any, record: any) => {
         return (
           <>
-            <Button type='link' onClick={() => history.push(`/trademark/trademarkWillCheck/detail?id=${record.id}`)}>审核</Button>
+            <Button type='link' onClick={() => history.push(`/productManage/trademark/trademarkWillCheck/detail?id=${record.id}`)}>审核</Button>
           </>
         )
       }

src/pages/systemManage/ruleSettingManage/mallRules/components/member.tsx

@@ -127,13 +127,13 @@ const MemberInfo: React.FC<Iprops> = (props) => {
           },
         },
         properties: {
-          memberTypeId: {
-            type: 'string',
-            enum: [],
-            "x-component-props": {
-              placeholder: '请选择会员类型',
-            }
-          },
+          // memberTypeId: {
+          //   type: 'string',
+          //   enum: [],
+          //   "x-component-props": {
+          //     placeholder: '请选择会员类型',
+          //   }
+          // },
           roleId: {
             type: 'string',
             enum: [],
@@ -196,10 +196,10 @@ const MemberInfo: React.FC<Iprops> = (props) => {
     const res = await PublicApi.getMemberManagePlatformProviderPage(params)
     const { code, data } = res
     if (code === 1000) {
-      let _data = data.data.map(item => ({ 
-        ...item, 
-        memberName: item.name, 
-        memberRoleId: item.memberId + '_' + item.roleId 
+      let _data = data.data.map(item => ({
+        ...item,
+        memberName: item.name,
+        memberRoleId: item.memberId + '_' + item.roleId
       }))
       return { totalCount: data.totalCount, data: _data }
     }
@@ -282,7 +282,7 @@ const MemberInfo: React.FC<Iprops> = (props) => {
                   FORM_FILTER_PATH,
                 );
                 useAsyncInitSelect(
-                  ['memberTypeId', 'roleId', 'level'],
+                  ['roleId', 'level'],
                   fetchSelectOptions,
                 );
               }