Merge branch 'ww' into 'main'

fix: fix bug DEFECT-394

See merge request huang/yun-teng-iot-front!214

@@ -15,8 +15,7 @@ enum MessageConfigApi {
  * 获取当前租户下的所有配置
  */
 export const findMessageConfig = (params: MessageParams) => {
-  console.log(params, 'params');
-  return defHttp.post<MessageConfigResult>({
+  return defHttp.post<MessageConfigResult[]>({
     url: MessageConfigApi.CONFIG_URL + '/find',
     params,
   });

@@ -39,7 +39,7 @@
       Select,
       LoadingOutlined,
     },
-    inheritAttrs: false,
+    inheritAttrs: true,
     props: {
       value: propTypes.oneOfType([
         propTypes.object,

@@ -438,9 +438,12 @@
     },
   });
 </script>
-<style scoped>
+<style scoped lang="less">
   .wrapper {
     position: relative;
+    :deep(.BMap_shadow) {
+      display: none;
+    }
   }
   .right-wrap {
     padding-top: 10px;

@@ -18,6 +18,7 @@
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { saveOrEditMessageTemplate } from '/@/api/message/template';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { findMessageConfig } from '/@/api/message/config';
   export default defineComponent({
     name: 'TemplateDrawer',
     components: { BasicDrawer, BasicForm },
@@ -40,6 +41,20 @@
             Reflect.set(data.record, key + '', config[key]);
           }
           await setFieldsValue(data.record);
+          const res = await findMessageConfig({});
+          const options = res.map((item) => {
+            return {
+              disabled: item.messageType !== data.record.messageType,
+              label: item.configName,
+              value: item.id,
+            };
+          });
+          await updateSchema({
+            field: 'messageConfigId',
+            componentProps: {
+              options,
+            },
+          });
           if (data.record.templatePurpose === 'FOR_LOGIN') {
             updateSchema({
               field: 'templatePurpose',

@@ -120,13 +120,34 @@ export const formSchema: FormSchema[] = [
     label: '消息类型',
     required: true,
     component: 'ApiSelect',
-    componentProps: {
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'message_type',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
+    componentProps({ formActionType }) {
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'message_type',
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        onChange: async (value) => {
+          const res = await findMessageConfig({});
+          let typeId: Nullable<string> = null;
+          const options = res.map((item) => {
+            if (item.messageType === value) typeId = item.id;
+            return {
+              disabled: item.messageType !== value,
+              label: item.configName,
+              value: item.id,
+            };
+          });
+          await formActionType.setFieldsValue({ messageConfigId: typeId });
+          await formActionType.updateSchema({
+            field: 'messageConfigId',
+            componentProps: {
+              options,
+            },
+          });
+        },
+      };
     },
   },
   {