feat: 合并edit-test-img代码

.env.development

@@ -1,8 +1,8 @@
 ENV = 'dev'
 
-VITE_APP_API_BASEURL =https://dev.ow.f2b211.com/admapi/v1
+VITE_APP_API_BASEURL =https://dev.cyberdata.oricostorage.com/admapi/v1
 #前端回显图片之类的地址
-VITE_APP_API_BASE_UPLOAD_URL =https://dev.ow.f2b211.com/
+VITE_APP_API_BASE_UPLOAD_URL =https://dev.cyberdata.oricostorage.com//
 # 本地环境
 VITE_USER_NODE_ENV = development
 

src/components.d.ts

@@ -7,16 +7,16 @@ export {}
 
 declare module "vue" {
     export interface GlobalComponents {
+        403: typeof import("./components/ErrorMessage/403.vue")["default"];
+        404: typeof import("./components/ErrorMessage/404.vue")["default"];
+        500: typeof import("./components/ErrorMessage/500.vue")["default"];
+        ColSetting: typeof import("./components/ProTable/components/ColSetting.vue")["default"];
+        Editor: typeof import("./components/Editor/index.vue")["default"];
         ElAside: typeof import("element-plus/es")["ElAside"];
         ElAutocomplete: typeof import("element-plus/es")["ElAutocomplete"];
         ElBreadcrumb: typeof import("element-plus/es")["ElBreadcrumb"];
         ElBreadcrumbItem: typeof import("element-plus/es")["ElBreadcrumbItem"];
         ElButton: typeof import("element-plus/es")["ElButton"];
-        ElCarousel: typeof import("element-plus/es")["ElCarousel"];
-        ElCarouselItem: typeof import("element-plus/es")["ElCarouselItem"];
-        ElCheckbox: typeof import("element-plus/es")["ElCheckbox"];
-        ElCheckboxGroup: typeof import("element-plus/es")["ElCheckboxGroup"];
-        ElColorPicker: typeof import("element-plus/es")["ElColorPicker"];
         ElContainer: typeof import("element-plus/es")["ElContainer"];
         ElDatePicker: typeof import("element-plus/es")["ElDatePicker"];
         ElDialog: typeof import("element-plus/es")["ElDialog"];
@@ -38,7 +38,6 @@ declare module "vue" {
         ElOption: typeof import("element-plus/es")["ElOption"];
         ElPagination: typeof import("element-plus/es")["ElPagination"];
         ElRadio: typeof import("element-plus/es")["ElRadio"];
-        ElRadioButton: typeof import("element-plus/es")["ElRadioButton"];
         ElRadioGroup: typeof import("element-plus/es")["ElRadioGroup"];
         ElScrollbar: typeof import("element-plus/es")["ElScrollbar"];
         ElSelect: typeof import("element-plus/es")["ElSelect"];
@@ -49,10 +48,12 @@ declare module "vue" {
         ElTabPane: typeof import("element-plus/es")["ElTabPane"];
         ElTabs: typeof import("element-plus/es")["ElTabs"];
         ElTag: typeof import("element-plus/es")["ElTag"];
-        ElTooltip: typeof import("element-plus/es")["ElTooltip"];
-        ElTree: typeof import("element-plus/es")["ElTree"];
         ElTreeSelect: typeof import("element-plus/es")["ElTreeSelect"];
         ElUpload: typeof import("element-plus/es")["ElUpload"];
+        Empty: typeof import("./components/ProTable/components/Empty.vue")["default"];
+        FormTable: typeof import("./components/FormTable/index.vue")["default"];
+        Grid: typeof import("./components/Grid/index.vue")["default"];
+        GridItem: typeof import("./components/Grid/components/GridItem.vue")["default"];
         IEpArrowDown: typeof import("~icons/ep/arrow-down")["default"];
         IEpCircleClose: typeof import("~icons/ep/circle-close")["default"];
         IEpFolderDelete: typeof import("~icons/ep/folder-delete")["default"];
@@ -60,7 +61,20 @@ declare module "vue" {
         IEpRemove: typeof import("~icons/ep/remove")["default"];
         IEpSearch: typeof import("~icons/ep/search")["default"];
         IEpSwitchButton: typeof import("~icons/ep/switch-button")["default"];
+        ImportExcel: typeof import("./components/ImportExcel/index.vue")["default"];
+        Index2: typeof import("./components/Editor/index2.vue")["default"];
+        Loading: typeof import("./components/Loading/index.vue")["default"];
+        Pagination: typeof import("./components/ProTable/components/Pagination.vue")["default"];
+        ProTable: typeof import("./components/ProTable/index.vue")["default"];
         RouterLink: typeof import("vue-router")["RouterLink"];
         RouterView: typeof import("vue-router")["RouterView"];
+        RulesForm: typeof import("./components/rulesForm/index.vue")["default"];
+        SearchForm: typeof import("./components/SearchForm/index.vue")["default"];
+        SearchFormItem: typeof import("./components/SearchForm/components/SearchFormItem.vue")["default"];
+        TableColumn: typeof import("./components/ProTable/components/TableColumn.vue")["default"];
+        UploadImg: typeof import("./components/Upload/UploadImg.vue")["default"];
+        UploadImgs: typeof import("./components/Upload/UploadImgs.vue")["default"];
+        UploadVideo: typeof import("./components/Upload/UploadVideo.vue")["default"];
+        WangEditor: typeof import("./components/WangEditor/index.vue")["default"];
     }
 }

src/components/ProTable/index.vue

@@ -168,7 +168,7 @@ const enumMap = ref(new Map<string, { [key: string]: any }[]>());
 provide("enumMap", enumMap);
 const setEnumMap = async (col: ColumnProps) => {
     if (!col.enum) return;
-    // 如果当前 enum 为后台数据需要请求数据，则调用该请求接口，并存储到 enumMap
+    // 如果当前 enum 为后台数1据需要请求数据，则调用该请求接口，并存储到 enumMap
     if (typeof col.enum !== "function") return enumMap.value.set(col.prop!, col.enum!);
     const { data } = await col.enum();
     enumMap.value.set(col.prop!, data);

src/views/bannerManagement/list/constant/edit.ts

@@ -27,6 +27,12 @@ export const EDIT_FORM_DATA: FormItem[] = [
         type: "input",
         label: "Banner名称: "
     },
+    {
+        prop: "short_title",
+        placeholder: "请输入",
+        type: "input",
+        label: "Banner简称: "
+    },
     {
         prop: "title_txt_color",
         placeholder: "填写RGB值",
@@ -127,6 +133,12 @@ export const EDIT_FORM_DATA1: FormItem[] = [
         type: "input",
         label: "Banner名称: "
     },
+    {
+        prop: "short_title",
+        placeholder: "请输入",
+        type: "input",
+        label: "Banner简称: "
+    },
     {
         prop: "title_txt_color",
         placeholder: "填写RGB值",

src/views/bannerManagement/list/index.vue

@@ -136,13 +136,18 @@ const treeProps = {
     value: "value"
 };
 
-//产品分类(后端大佬说直接掉列表接口)
+//banner分类
 const getProductCategoryList = async () => {
     const result = await getProductCategoryListApi();
     if (result?.code === 0) {
         let dataClone: any = cloneDeep(result?.data);
         console.log(dataClone, "=dataClone=");
-        dataStore.editFormData[7].options = addLabelValue(dataClone);
+        dataStore.editFormData.forEach((item: any) => {
+            if (item.prop === "rel_prod_cate_id") {
+                item.options = addLabelValue(dataClone);
+            }
+        });
+        // dataStore.editFormData[8].options = addLabelValue(dataClone);
     }
 };
 
@@ -356,7 +361,8 @@ const handleAdd = () => {
     dataStore.visible = true;
     selectedNodes.value = "";
     dataStore.editRuleForm = cloneDeep(EDIT_RULE_FORM);
-    (dataStore.editFormData = cloneDeep(EDIT_FORM_DATA)), // 抽屉表单配置项
+    dataStore.editFormData = cloneDeep(EDIT_FORM_DATA); // 抽屉表单配置项
+    dataStore.rules = cloneDeep(RULES);
     getBannerClassEditList();
     // getBannerClassList();
     getProductCategoryList();
@@ -364,7 +370,8 @@ const handleAdd = () => {
 // 抽屉关闭前的钩子
 const handleBeforeClone = () => {
     dataStore.editRuleForm = cloneDeep(EDIT_RULE_FORM);
-    (dataStore.editFormData = cloneDeep(EDIT_FORM_DATA)), // 抽屉表单配置项
+    dataStore.editFormData = cloneDeep(EDIT_FORM_DATA); // 抽屉表单配置项
+    dataStore.rules = cloneDeep(RULES);
     resetFields();
     dataStore.visible = false;
     dataStore.isFirstRequest = true;

src/views/productManagement/classList/index.vue

@@ -167,6 +167,11 @@ const getProductCategoryUpdate = async () => {
         dataStore.visible = false;
         resetFrom();
         getProductCategoryList();
+        console.log("走的进来吗");
+    } else {
+        dataStore.ruleForm.related_tco_category = dataStore.ruleForm.related_tco_category
+            .split(",")
+            .map((item: any) => Number(item));
     }
 };
 //产品详情