1

3a1fe5ba · haojie · da11b384 · 3a1fe5ba · 3a1fe5ba · 3a1fe5ba
Commit 3a1fe5ba authored Apr 24, 2023 by haojie
6 changed files
--- a/src/assets/img/ee67ff8e-6191-435c-ad29-b2a6390fc344.png
+++ b/src/assets/img/ee67ff8e-6191-435c-ad29-b2a6390fc344.png
--- a/src/components/custom/ImageEdit.vue
+++ b/src/components/custom/ImageEdit.vue
@@ -45,12 +45,7 @@ const props = withDefaults(
    config: {},
  }
 );
-const emit = defineEmits([
+const emit = defineEmits(['moduleChange', 'delete', 'submit']);
-  'update:module_status',
-  'moduleChange',
-  'delete',
-  'submit',
-]);
 // 添加可以拖拽功能,放大缩小功能
 const backimg = ref(props.edit_image);
@@ -111,6 +106,7 @@ const ConversionImage = async () => {
        }
        const url = res.response.url;
        // 通知父组件提交任务
+        console.log(url);
        emit('submit', url);
      }
    }
@@ -124,6 +120,7 @@ const ConversionImage = async () => {
 watch(
  () => props.module_status,
  (v) => {
+    console.log('监听到了');
    if (v == ModelStatus.upload) {
      // 上传并提交任务
      ConversionImage();

--- a/src/components/custom/SelectModel.vue
+++ b/src/components/custom/SelectModel.vue
@@ -90,6 +90,10 @@ const Search = async () => {
        },
        {
          image:
+            'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBw8PDw0NDQ0NDQ0NDQ0ODQ0NDQ8PDQ0NFREWFhURFhUYHSggGBomGxUVITEjJiorLi4uFx8zODMuNyg5LisBCgoKDQ0OGxAPFyshHR0rNTcrKy0rKysrLSsrLSstLSsrLS0tLSstLSsrLSstLS0rNysrMCs3KysrLS0tKysrLf/AABEIARYAtgMBIgACEQEDEQH/xAAcAAADAAMBAQEAAAAAAAAAAAAAAQIDBAUGBwj/xAA4EAACAgECAwUGBQMDBQAAAAAAAQIRAwQSBSExE0FRcZEGIlJhgaEHIzKxwRRC0TRy8BczkqLh/8QAGAEBAQEBAQAAAAAAAAAAAAAAAAEDAgT/xAAgEQEAAgIBBQEBAAAAAAAAAAAAAQIDETESITJBUSIT/9oADAMBAAIRAxEAPwD29DSGkUkV0SQ0hpFJAJIpIEikgEUgSKSASRVDodEE0OiqCgEkFDoYCoKGAEiZVCoCGQzK0JoDCyWjK0S0UYaAyUAEJFJAkUkAJDSGkNIgSRaQ0hgJIpIENIAodDodARknGMZSnJRjFOUpSaUYxXVtvoj59x78VtLh93R4cmsnfKTfY4XzdtNpyfd3JO+TOd+JPFcuu1S4NpHPZjaeqUXSzZOTUG/hjab+b+RyeI+wWohszQgp9niqahfN23a9fsczaInTqKWmNw73BPxVeWajqtD2cPiw5XKSX+ySV+p9G0Orx58cM2GayYpq4yj90/Bp8mn0Pznn1EscqcUtr5p8me9/Crj23VT0TleLVQllwq+Uc8FbS84p/wDgjpzp9WoKKoQEgNiAkTKZLAiRDMjRLRRFANoCCUikgSGgGhpDSGgAaQIpIBIpIEikgFRSQJDbpW+iA+MaPVrB7QcReVS97JlSSi3KrXveXf8AU+hYONbc0cMlFRyxTwpRlOeaPfK+kUfPPxO0WLFxTBrZe9p9RsebbacXFKE0/Dltl8+Z9F0XEMEtPp+ylBQwQjGLlKMdyS5qPj0PPk529eLetOd7W+wmm1SjOEexyykt0ocrT+R4LinD1wri+ieKKx4Yz0+SMVK9sFPZN+Tim/qz7RLLFwU7XS0fEPxIwThxFubm45cGJwcpOTpOSaTfcr+5zjtPVoyVjp3p95aFRzfZbif9XotNqLuU8UVk+WWPuz+6Z1KPU8iKFRdA0BjaJaMjQmgMTRLRlaJaAxOIFtABFDSHQIBjQJDQDGgSGkA0MEhgNI0+IZZpLbHdHdtmrp1Xd8+f2N1ETX6rpx92/NGeXxa4fJ8N/ErWZ8upwaNxnkcYtrLBtR1MptJXj6b4c1fWmyvY7juLQZoYtVeL8vZueOUsmPJF12TpNq1T6dbR9Y4rpNBgcOI6vHjg9M3LHkcZSeNyi4t0urp/Tkc3N7L6fWLLxh6VwlLDL+mx5o7JTVf6icP7XJVSfOlb5ulNfnS9cxfcSw8O4/i1kvyN3YwlXNOLlJPrT7j0XEPYfS6/GnrYS3qE44ZQk4zwuS/X838nyNT2E9mI6PTrM6y6icpNOvdTTd0vG75+R63+sb2xliyQnLwjuj6r+TnHjiJ6pdZcsz+YfOfYjQ6nhmfU8L1UJvC5vJpdTGEuwycla3dItqntfen9fbtHUliT6rzrvNXU6ala6eBu8+2pQiqEBLJZdEtAQyWZGiGgJAYARQILGgGNANAMaEikAxoENANEdd3+6K/YyIjSu6fjkX7mWT1DXF7k9XwmGoxuGWOOcZ17uXHvjS58lap2bOGE44np8kpTlJSjHI1aaa5J106m9f0+RSXeaaZbYtJgWOEYLnSq/rb+5nj4kJouLvy7i8JM7C/4zDn/AEzf0M05JdTW1c/dS75O35AaLEUxBUCZTEwIZLLZLAihgxgYSkJDQDRSQkNANFCGgGikSigCT5PyZr6HJ7l+Er9GZ879yfyjJ/Y5ekzqOHe3y53zPPlnvD0YY3EvQ5MvvOK5OLV/VWmN5G43fh/JyY8VhkncYThFQjG5JLfTdNU+lX1rqgz8UjFVFfWX+DbrrHtlGO0+nSTcqipqLXN8tz68uXgbsINdGmvr1PJafjM4ZG4wjkeVJSlKezal0rk76no8eqlkxvJiklKMoxqatN8m06d9Hy6HNckWLYrV5bDkud9V1T7jTzTtt/ReRm1E03fe0a524SIoQEiZTEwIZLLZLKIAbADAUiUUgKGJDQDRQhoBlIlFogU5qMXKTpRTbfyPF5NXppZWlOLySyNw06yKMIy7vcvmz20kmqatPk0+jNKPBNLbktLhvnJyWKDmu+1fecXr1Ncd4q4GKeecd0cGVJ9Htq/mrHj0Geb54sv12pL7nrsm7koJqK5UouzZwS6Jvm/E5/lDr+9nA0vAlXv3fgr/AHOtosUcMOzjcqk58++T5c34dF9DoRgjBqYtHcUiOGdr2ty17b5vqAAdOCBjEAhDEwJZLLZLKIYDYAayKRI0BSKRKGgKGiUUiC0UiEWgKK37Yyfi4r1ZJg1V9lNrrGUZMDejkqeSD+JtV4PmbafP6I1JwUpRmnzca8zYh1f0X2KjL3fcWaFp+Q0+dFf/AFAcwYSVNrwbERQIAACWMQCZLKZLKJYDADUQ0SUgKRSIQ7ILKRES0BSLRCLQDZig7xZTJJ8n5GDSSuGUKzaLLcI36+Do6cFzZxOEyTilupqW1r68mdrDK782EOTpp/My+Jjqyovl5AaOX9UvNkjyfql5skAAAAQmUSwExMbJYCAAKNMEJDQFFIlFIgpFolFICkUiUUgJy9Ga+gl/3EbGTuNHC6nNfMKjg8ms8oL4m+h6PTfo8zgcNx/n5n0Sxt/XlX7noodEvFBJUhiRQHOm/el5v9xA+rAAABgITGJgSxMolgSAwKNGxokaAtFIlFIgtFIhFIC0UiEUAn1Xkc+fLKzonO1SrJ5oLDc4Zjf58l3uC+nedpftRz+D4/y2/im/Q3YTit1yiuffJIIztEt8mY4Z4N7Vkg33RUluY8r92XkwOeiiUMB2AgALEOhUAhMYmgEAABoIpEopFFIpEopEFIpEopAUiiUOwKMWfFuXzXQyBYG5pax4E7VxhJtd9qzjYY8kafEcdamEn0ljSXnFu1916nQwOzz5LbnXx6sddV39Yp6eU7ca5clzp31NzS6rOl2eWLlFqt7a3R/yGHla+dmQ1pHZjee8qSHRI7O2agFYAMVgIAJYyWAAAAaKKRKKRQ0MSGQUhokaAtFEJjsCgJsLA5/H57cUcnwZI+jTTDQ6jck/EXtDG9Nk+Ti/vX8nL9ns1pRfdyPPkj9PVi8HpFLmn48mZkzVXebEWd4p7aZ5Y77WMix2asVDJCwKEFhYAyR2IBAFgBpDQqHRQxiAgdjskALsdkIdgXYWRYWBj18N2LLHxhL1XM8twiezLXdLp5o9ceN1ceyyWv7Jv7Mxy/XowTzD2MeiZkg+SNTRZN0E+vI2YsYuTLwy2CZAzZ52SwsiwsC7CyLCwLslslyJbAvcBisYD2B2Zn2lbCjW2BsNnYG0DW7MNhsbRbSDX2i2mw4EOAGKgopoAJo8zxvB72Zruafqk/5PUHL1mHdPKn3xh+xll4bYJ1Zr+zufdjS8OR2cfO14M8v7MNp5U/7cs4+lHa4pqnhw5c0Wk8cNy3fpk0+UX8nyX1M6TqW2Wu4dNIdGLh2rhnxY8+P9OSKkk+sX0cX807X0Nmj0vGig2mTaG0DHtFtMu0VAYtonEytCaKjDQGRoQG1YFUMKmg2lAELaFDAKTRDiZAA1pYzFKNG7Rr6iUYqUpyjGMVcpSaUYrxbfQg17NDtVWTLN1HnK30UUv8HF4r7ZYFJ4sUcmSFVLNGlHyinV9/P9zy/tT7VrUwjodOsuPHkpanLUe0WK/eUUuV13szvEzOmuOYrEzL1nspJZMfbr9Oonkyw+UJSez/1p/UfthL8rDpoNdpqc0IRTdWrSX03OJfAdXpYYscceXDDFjhGMIvJFbIJUou+fJeJpahf12qnmwfmR0mbhscT6Re3VQyZZq/CEZL52Z0jdmuS2qvYcJ4etNgxYIvcscacum6Tbcn9W2bm0qPMqj0PKx7QoyCoqIoVGShUBjoTRkoTQGJoC2gAy0AwCigoY6CFQbSgAW0KGAUtpzOOcDxayMIZpZYxg3JLHPam33tNO67vNnUADyP8A0/0XfLUS88tfskcTJ+HEo5MjwTwwxSlcd8ssppfPl/J9IoVEHgMH4eStOeqgl3qGFt+rkeq4LwPHpMbx47lcnKU505SlVX9jq0OgMWwDLRLiBFjsGhFQ7CxAAxAACABAdrYvhXog2L4V6IACDYvBeiDYvBeiAADYvBeiDYvBeiAADYvBeiDYvBeiAANTVYMznB4pY449k1OMopyc2vdknXc+7vFDDnqdvA2+z2XBuMfjuqfkMAGsWalbw7k3e2D2tcq5Pn494+zzbV/p9/O3slt7q5X5gABPDleyniXurf7nJz76+RLwZuVSxd13Hrzd93hXp0AAM+DG1H8zbKXjFUjJsXgvRAAB2cfhXog7OPwx9EIAH2cfhj6IOzj8MfRCAB9nH4Y+iDs4/DH0QgAfZx+GPohAAH//2Q==',
+        },
+        {
+          image:
            'data:image/jpeg;base64,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',
        },
      ];

--- a/src/pages/ModelTemplate/components/GenerateResult/index.less
+++ b/src/pages/ModelTemplate/components/GenerateResult/index.less
@@ -21,6 +21,10 @@
      color: #888fa1;
    }
  }
+  .change-img {
+    width: 100%;
+    height: 90%;
+  }
  .load-success-box {
    padding: 0 20px;
    height: 100%;

--- a/src/pages/ModelTemplate/components/GenerateResult/index.tsx
+++ b/src/pages/ModelTemplate/components/GenerateResult/index.tsx
-import { defineComponent } from 'vue';
+import { defineComponent, ref, watch } from 'vue';
 import './index.less';
 import CustomResetButton from '@/components/custom/resetbutton.vue';
 import OnWait from '@/components/custom/ImgLoadingStatus/OnWait.vue';
 import OnLoading from '@/components/custom/ImgLoadingStatus/OnLoading.vue';
+import ImageEditVue from '@/components/custom/ImageEdit.vue';
+import { ModelStatus } from '@/utils/api/Task';
 export default defineComponent({
  props: {
    list: Object as any,
    status: String,
+    backgroundImage: String,
+    config: Object as any,
+    OverlayImages: Object as any,
+    module_status: Number,
  },
  setup(props, ctx) {
+    const cur_module_status = ref(ModelStatus.wait);
+    watch(
+      () => props.module_status,
+      (v) => {
+        if (v) {
+          cur_module_status.value = v;
+        }
+      }
+    );
    // 为空时展示的html
    const EmptyHTML = () => {
      return <OnWait></OnWait>;
@@ -18,6 +33,10 @@ export default defineComponent({
    const LoadingHTML = () => {
      return <OnLoading></OnLoading>;
    };
+    // 修改图片时的html
+    const EditHTML = () => {
+      return '';
+    };
    // 加载完成展示的html
    const LoadSuccessHTML = () => {
      return (
@@ -47,11 +66,24 @@ export default defineComponent({
        return EmptyHTML();
      } else if (status == 'loading') {
        return LoadingHTML();
+      } else if (status == 'edit') {
+        return EditHTML();
      } else {
        return LoadSuccessHTML();
      }
    };
-    return () => <div class="img-res-status">{CurrentModule()}</div>;
+    return () => (
+      <div class="img-res-status">
+        {CurrentModule()}
+        <ImageEditVue
+          v-show={props.status == 'edit'}
+          module_status={cur_module_status.value}
+          list={props.OverlayImages}
+          edit_image={props.backgroundImage}
+          config={props.config}
+        ></ImageEditVue>
+      </div>
+    );
  },
 });
--- a/src/pages/ModelTemplate/index.vue
+++ b/src/pages/ModelTemplate/index.vue
@@ -53,6 +53,9 @@
                    @SubmitModel="SubmitModel"
                  ></SelectModel>
                </template>
+                <template v-else-if="it.component_type == 'local_upload'">
+                  <LocalUpload @SubmitImg="SubmitImg"></LocalUpload>
+                </template>
              </template>
            </div>
          </div>
@@ -72,7 +75,11 @@
        <div class="generate-result">
          <CustomGenerateResult
            :status="AdminData.status"
+            :backgroundImage="backgroundImage"
+            :OverlayImages="OverlayImages.list"
            :list="AdminData.callback_list"
+            :module_status="AdminData.module_status"
+            :config="StrategyConfig"
          ></CustomGenerateResult>
        </div>
      </div>
@@ -90,6 +97,7 @@ import CustomInput from '@/components/custom/input/index.vue';
 import CustomResetButton from '@/components/custom/resetbutton.vue';
 import SelectModel from '@/components/custom/SelectModel.vue';
 import CustomGenerateResult from './components/GenerateResult';
+import LocalUpload from '@/components/custom/LocalUpload.vue';
 import {
  nextTick,
  onBeforeMount,
@@ -105,7 +113,7 @@ import {
  useSubmitConversationImage,
  useImageCallback,
 } from '@/utils/api/scenes';
-import { FormExample4 } from '@/utils/api/Task';
+import { FormExample4, ModelStatus } from '@/utils/api/Task';
 import { Validationrules, ChangePageHeight } from '@/utils/tool';
 import { useRoute } from 'vue-router';
 import { show_message } from '@/utils/tdesign_tool';
@@ -119,6 +127,8 @@ const GenerationBox = ref();
 let IntervalImg: any = null;
 // 本次提交的数量
 const CurSubmitNum = ref(0);
+// 背景图
+const backgroundImage = ref('');
 // 上传策略
 const StrategyConfig = ref({});
 const AdminData = reactive({
@@ -130,8 +140,13 @@ const AdminData = reactive({
   * success-结束
   */
  status: '',
+  module_status: ModelStatus.wait,
  reset_num: 1,
 });
+//
+const OverlayImages = reactive({
+  list: [],
+});
 const scenario_id = ref();
 // 元素高度和页面高度比较
 const getElementHeight = () => {
@@ -139,6 +154,14 @@ const getElementHeight = () => {
    ChangePageHeight(GenerationBox.value);
  }
 };
+// 提交的图片
+const SubmitImg = (item: any) => {
+  if (OverlayImages.list.length) {
+    OverlayImages.list[0] = item;
+  } else {
+    OverlayImages.list.push(item);
+  }
+};
 // 获取后台配置的组件
 const getAdminComponent = async () => {
  try {
@@ -170,6 +193,8 @@ const getAdminComponent = async () => {
              it.component_type = 'custom-number';
            } else if (it.type == 'select_model') {
              it.component_type = 'select_model';
+            } else if (it.type == 'local_upload') {
+              it.component_type = 'local_upload';
            }
            //   判断value的值
            if (!it.value) {
@@ -195,7 +220,8 @@ const getAdminComponent = async () => {
 // 用户选择的模特
 const SubmitModel = (img: string) => {
  if (img) {
-    console.log(1);
+    backgroundImage.value = img;
+    AdminData.status = 'edit';
  }
 };
 const getStrategy = async () => {
@@ -288,51 +314,9 @@ const onSubmit = async (params: any) => {
 };
 // 提交前的校验
 const beforeSubmit = () => {
-  // 定时器不能为开启状态
+  // 通知子组件上传图片
-  if (IntervalImg) {
+  AdminData.module_status = ModelStatus.upload;
-    show_message('请等待上一个任务完成');
+  AdminData.status = 'loading';
-    return;
-  }
-  let params: any = {};
-  // 遍历整个列表
-  for (let i = 0; i < AdminData.list.length; i++) {
-    let item: any = AdminData.list[i];
-    for (let j = 0; j < item.lists.length; j++) {
-      let it = item.lists[j];
-      // 校验规则
-      let message = Validationrules(it.rules, it.value, it.name);
-      if (message) {
-        // 提示错误信息
-        show_message(message);
-        return;
-      } else {
-        // 类型为图片尺寸且当前选择的是自定义
-        if (it.type == 'radio_group_size' && it.value == '') {
-          // 找到options列表里的自定义模块
-          let customObj = it.options.find((opt: any) => opt.type == 'custom');
-          if (customObj) {
-            if (customObj.value1 && customObj.value2) {
-              params[it.name] = customObj.value1 + 'x' + customObj.value2;
-            } else {
-              show_message('自定义图片尺寸未填写完整');
-              return;
-            }
-          }
-        }
-        if (it.value) {
-          if (it.name == 'number') {
-            // 转换为number类型
-            params[it.name] = parseFloat(it.value + '');
-          } else {
-            // 添加params
-            params[it.name] = it.value;
-          }
-        }
-      }
-    }
-  }
-  console.log(params);
-  onSubmit(params);
 };
 onBeforeMount(async () => {
  //   获取上传策略
@@ -414,11 +398,16 @@ onBeforeUnmount(() => {
            .input-pay-num {
              width: 100%;
            }
+            .local-file-upload {
+              width: 100%;
+              height: 225px;
+            }
          }
        }
        .confirm-box {
+          flex: 1;
          display: flex;
-          align-items: center;
+          align-items: flex-end;
          justify-content: space-between;
          margin: 20px 0;
          box-sizing: border-box;