!2458 开发修复:大小写错误引用,store改为BrandStore

pull/2391/MERGE
张子涵 11 months ago committed by ChenX
parent 4fd7085672
commit c458a15a06

@ -1,5 +1,5 @@
import { Intent } from "@blueprintjs/core";
import { HistoryToaster, OperLogs } from "../Add-on/File/OperLog";
import { HistoryToaster, OperLogs } from "../Add-on/File/operLog";
import { app } from "../ApplicationServices/Application";
import { FS } from "../Common/FileSystem";
import { FileUrls, TemplateUrls } from "../Common/HostUrl";

@ -130,7 +130,7 @@ import { Command_ExportSTL } from "../Add-on/Exports/ExportSTL";
import { Command_Extend } from "../Add-on/Extends";
import { Command_FZWL } from "../Add-on/FZWL";
import { Command_OpenHistory } from "../Add-on/File/OpenHistory";
import { OperLogs } from "../Add-on/File/OperLog";
import { OperLogs } from "../Add-on/File/operLog";
import { CommandFillet } from "../Add-on/Fillet";
import { Command_FindBoardModelingKnife } from "../Add-on/FindBoardModelingKnife";
import { Command_Fix2DPath } from "../Add-on/Fix/Fix2DPath";

@ -3,7 +3,7 @@ import { ResourceLibraryURL } from "../../../../../Common/HostUrl";
import { LogType } from "../../../../../Common/Log";
import { Post, PostJson, RequestStatus } from "../../../../../Common/Request";
import { ModuleList, RenderClassList } from "../ResourceInterfaces";
import { ForceUpdate, store } from "./BrandData";
import { BrandStore, ForceUpdate } from "./BrandData";
/** 获取所有的品牌 */
export const GetBrands = async () =>
@ -67,7 +67,7 @@ export const GetModels = async ({ type = "1", class_id = "", params = undefined,
};
/** 搜索模型 */
export const search = async (data: typeof store, setData: Function, params?: { name?: string, logo?: File; curr_Page?: string; }) =>
export const search = async (data: typeof BrandStore, setData: Function, params?: { name?: string, logo?: File; curr_Page?: string; }) =>
{
// 发出请求
data.isLoad = true;

@ -9,7 +9,7 @@ interface Item
/** 品牌库的状态 */
export const store = {
export const BrandStore = {
/** 显示品牌列表还是模型列表 */
type: "1",
/** 所有的品牌 */
@ -46,6 +46,6 @@ export const ForceUpdate = (data: any, setData: Function) =>
setData(newData);
};
export type BrandContext = [typeof store, Function];
export type BrandContext = [typeof BrandStore, Function];
export const BrandGlobalContext = createContext<any>({});

@ -20,7 +20,7 @@ import { getModuleDetail } from "../../ResourcesData";
import ResourceStore, { pageCount } from "../../RsourceStore";
import { RenderNoResult } from "../../UserCollect";
import { search } from "../BrandAPI";
import { BrandContext, BrandGlobalContext, ForceUpdate, store } from "../BrandData";
import { BrandContext, BrandGlobalContext, BrandStore, ForceUpdate } from "../BrandData";
import { Base_Name } from "./BaseUI";
/** 种类列表 */
@ -104,7 +104,7 @@ function Kind_Item({ item, index })
const HandleClick = async (item: any) =>
{
data.currentKind = item;
data.pages = store.pages;
data.pages = BrandStore.pages;
await search(data, setData);
};

@ -8,7 +8,7 @@ import React, { createRef, useContext, useState } from "react";
import { ResourcePanelType } from "../ResourcePanel";
import ResourceStore from "../RsourceStore";
import { GetKinds, search } from "./BrandAPI";
import { BrandContext, BrandGlobalContext, ForceUpdate, store } from "./BrandData";
import { BrandContext, BrandGlobalContext, BrandStore, ForceUpdate } from "./BrandData";
import "./BrandStyle.css";
import { Base_Icon, Base_Name } from "./Components/BaseUI";
import { Brand_List } from "./Components/Brand_List";
@ -17,7 +17,7 @@ import { Kind_List } from "./Components/Kind_List";
/** 品牌库UI */
export default function Resoure_Brand()
{
const [data, setData] = useState(store); // 初始状态
const [data, setData] = useState(BrandStore); // 初始状态
return (
<BrandGlobalContext.Provider value={[data, setData]}>
{data.type && <Top_Title />}
@ -49,9 +49,9 @@ function Top_Title()
else
{
// 状态初始化
for (const key in store)
for (const key in BrandStore)
{
data[key] = store[key];
data[key] = BrandStore[key];
}
ForceUpdate(data, setData);
}

@ -1,7 +1,7 @@
import { Card } from "@blueprintjs/core";
import { observer } from 'mobx-react';
import React, { Component } from 'react';
import Resoure_Brand from "./Brand_Library";
import Resoure_Brand from "./Brand_library";
import "./ResourceLibrary.less";
import Resource_By_Image from "./Resource_By_Image";
import Resource_CategoriesList from "./Resource_CategoriesList";

Loading…
Cancel
Save