p-pc-ui 1.3.2 → 1.3.4

package/dist/components/p-form/index.d.ts

@@ -15,7 +15,7 @@ interface Base<K extends string = string> {
     labelSpan?: number,
     valueSpan?: number,
     labelAlign?: 'left' | 'right',
-    disabled:?: boolean
+    disabled: ?boolean
 }
 
 
@@ -106,12 +106,6 @@ export interface Component<K extends string = string> extends Base<K> {
     component: any
 }
 
-export interface Editor<K extends string = string> extends Base<K> {
-    type: 'editor',
-    getOssToken: ({ file_name: string }) => Promise<any>,
-    baseOssUrl?: string,
-}
-
 
 export type FormDataItem<K extends string = string> =
     | Input<K>
@@ -125,4 +119,3 @@ export type FormDataItem<K extends string = string> =
     | Textarea<K>
     | DatePicker<K>
     | Component<K>
-    | Editor<K>

package/dist/components/p-form/p-form.vue

@@ -23,8 +23,6 @@ import * as _ from "../../utils/dataUtils";
 import { api as viewerApi } from "v-viewer";
 import dayjs from "dayjs";
 import { UploadOutlined, PlusOutlined } from "@ant-design/icons-vue";
-import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
-import "@wangeditor/editor/dist/css/style.css"; // 引入 css
 
 const uSlots = useSlots();
 
@@ -63,8 +61,6 @@ const emits = defineEmits(["confirm"]);
 /**
  * 富文本相关配置
  */
-const editorRef = shallowRef();
-
 onBeforeMount(async () => {
   renderData.value = await disposeRenderData(props.renderData);
   const _formState = initFormState(renderData.value, props.initForm);
@@ -245,8 +241,6 @@ const initFormState = (renderData: FormDataItem[], initFromData = {}) => {
           url: renderItem.baseTosUrl + val,
         };
       });
-    } else if (renderItem.type == "editor") {
-      initValue = initValue.replace(/\<\<图片替换地址\>\>/g, renderItem.baseOssUrl);
     }
 
     _formState[renderItem["key"]] = initValue;
@@ -304,20 +298,6 @@ const getFormData = async (options: { no_check?: Boolean } = {}) => {
       returnFormData[key] = formatData;
     }
 
-    // 处理富文本字段
-    else if (renderItem.type == "editor") {
-      const richText = formData[key];
-      const dom = new DOMParser().parseFromString(richText, "text/html");
-      // 将视频居中展示
-      const videos = dom.querySelectorAll('[data-w-e-type="video"]') || [];
-      //@ts-ignore
-      for (const video of videos) {
-        //@ts-ignore
-        video.style.textAlign = "center";
-      }
-      returnFormData[key] = replaceUrl(dom.body.innerHTML, renderItem.baseOssUrl, "<<图片替换地址>>");
-    }
-
     // 转换成上传对象
     else if (key.includes("__")) {
       _.set(returnFormData, key.split("__"), formData[key]);
@@ -421,15 +401,6 @@ const uploadRequest = async (options, renderItem: FormDataItem) => {
   }
 };
 
-/**
- * 富文本上传
- */
-const editorUpload = async (renderItem, file, insertFn) => {
-  const config: any = await renderItem.getOssToken({ type: renderItem.ossKey, file_name: file.name });
-  const key = await uploadOss(file, config);
-  insertFn(renderItem.baseOssUrl + key);
-};
-
 /**
  * 发送验证码
  */
@@ -455,10 +426,6 @@ const sendNoticeClick = async (renderItem) => {
   renderItem.interval = copyInterval;
 };
 
-const handleRichEditorCreated = (editor) => {
-  editorRef.value = editor;
-};
-
 defineExpose({
   getFormData,
   resetForm,
@@ -642,38 +609,6 @@ defineExpose({
             </div>
           </a-upload>
 
-          <div style="border: 1px solid #ccc" v-if="renderItem.type == 'editor'">
-            <Toolbar
-              style="border-bottom: 1px solid #ccc"
-              :editor="editorRef"
-              :defaultConfig="{
-                excludeKeys: ['insertVideo', 'insertImage', 'codeBlock'],
-              }"
-              mode="default"
-            />
-            <Editor
-              style="height: 500px; overflow-y: hidden"
-              v-model="formState[renderItem.key]"
-              :defaultConfig="{
-                placeholder: '请输入内容...',
-                MENU_CONF: {
-                  uploadImage: {
-                    customUpload: async (file, insertFn) => {
-                      await editorUpload(renderItem, file, insertFn);
-                    },
-                  },
-                  uploadVideo: {
-                    customUpload: async (file, insertFn) => {
-                      await editorUpload(renderItem, file, insertFn);
-                    },
-                  },
-                },
-              }"
-              mode="default"
-              @onCreated="handleRichEditorCreated"
-            />
-          </div>
-
           <component v-if="renderItem.type == 'component'" :is="renderItem.component"></component>
         </div>
       </a-form-item>

package/dist/components/p-modal-confirm/p-modal-confirm.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted, computed, withDefaults } from 'vue'
+import { ref, computed } from 'vue'
 import { Modal as AModal, Button as AButton } from 'ant-design-vue'
 
 const {
@@ -34,7 +34,6 @@ const confirmClick = async () => {
   loading.value = true
   try {
     confirm && (await confirm())
-    // 同时兼容多种回调方式
     emits('confirm')
   } catch (err) {
   } finally {
@@ -47,48 +46,85 @@ const confirmClick = async () => {
 <template>
   <a-modal v-model:visible="show" :width="width" centered wrapClassName="p-modal">
     <template #title v-if="title">
-      <div class="p-[20px] text-[18px] font-bold leading-[27px] text-[#272727]">
+      <div class="modal-title">
         {{ title }}
       </div>
     </template>
-    <div class="border-t border-[#cecece] p-[20px] pb-[0px] text-[16px] text-[#272727]">
-      <div v-html="content"></div>
 
+    <div class="modal-content">
+      <div v-html="content"></div>
     </div>
 
     <template #footer>
-      <div class="flex justify-end p-[20px]">
+      <div class="modal-footer">
         <a-button
-          class="h-[38px] w-[76px] rounded-[100px]"
-          style="border: 1px solid #272727"
+          class="modal-btn modal-cancel-btn"
           @click="show = false"
-          >取消</a-button
         >
+          取消
+        </a-button>
 
         <a-button
-          class="h-[38px] w-[76px] rounded-[100px] !text-white"
+          class="modal-btn modal-confirm-btn"
           :style="{
             border: 'none',
             backgroundColor: confrimBtnBgColor,
           }"
           @click="confirmClick"
           :loading="loading"
-          >确定</a-button
         >
+          确定
+        </a-button>
       </div>
     </template>
   </a-modal>
 </template>
 
-<style lang="scss">
-.p-modal {
-  .ant-modal {
-    border-radius: 16px !important;
-    overflow: hidden;
-  }
-  .ant-modal-content {
-    padding: 0px !important;
-    border-radius: 16px !important;
-  }
+<style>
+.p-modal .ant-modal {
+  border-radius: 16px !important;
+  overflow: hidden;
+}
+
+.p-modal .ant-modal-content {
+  padding: 0 !important;
+  border-radius: 16px !important;
+}
+
+.modal-title {
+  padding: 20px;
+  font-size: 18px;
+  font-weight: 700;
+  line-height: 27px;
+  color: #272727;
+}
+
+.modal-content {
+  border-top: 1px solid #cecece;
+  padding: 20px;
+  padding-bottom: 0;
+  font-size: 16px;
+  color: #272727;
+}
+
+.modal-footer {
+  display: flex;
+  justify-content: flex-end;
+  padding: 20px;
+  gap: 8px;
+}
+
+.modal-btn {
+  width: 76px;
+  height: 38px;
+  border-radius: 100px;
+}
+
+.modal-cancel-btn {
+  border: 1px solid #272727;
+}
+
+.modal-confirm-btn {
+  color: #fff !important;
 }
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "p-pc-ui",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "type": "module",
   "module": "dist/index.ts",
   "main": "dist/index.ts",