p-pc-ui 1.3.10 → 1.3.11

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

@@ -1,5 +1,12 @@
 
-type FieldRule = { msg?: string, required?: boolean, min?: number, max?: number, decimal?: number }
+type FieldRule = {
+    msg?: string,
+    required?: boolean,
+    min?: number,
+    max?: number,
+    decimal?: number,
+    regex?: RegExp,
+}
 
 interface Base<K extends string = string> {
     key: K,
@@ -76,13 +83,13 @@ interface UploadBase<K extends string = string> extends Base<K> {
 
 export interface UploadOss<K extends string = string> extends UploadBase<K> {
     type: 'uploadOss',
-    getOssToken: ({ file_name }) => Promise<any>,
+    getOssToken: ({ file_name }: { file_name: string }) => Promise<any>,
     baseOssUrl: string,
 }
 
 export interface UploadTos<K extends string = string> extends UploadBase<K> {
     type: 'uploadTos',
-    getTosToken: ({ file_name }) => Promise<any>,
+    getTosToken: ({ file_name }: { file_name: string }) => Promise<any>,
     baseTosUrl: string,
 }
 

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

@@ -23,6 +23,7 @@ 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 { log } from "echarts/types/src/util/log.js";
 
 const uSlots = useSlots();
 
@@ -82,12 +83,11 @@ const disposeRenderData = async (renderData: FormDataItem[]) => {
     let { fieldType, fieldRules, label } = renderItem;
     // 处理校验规则
     const rules: any = [];
-    const operateType = ["select", "treeSeect", "date", "datePicker"].includes(renderItem.type) ? "选择" : "输入";
+    const operateType = ["select", "treeSelect", "date", "datePicker"].includes(renderItem.type) ? "选择" : "输入";
     for (const fieldRule of fieldRules || []) {
-      const { msg, required, min, max } = fieldRule;
+      const { msg, required, min, max, regex } = fieldRule;
 
       // 图片需要额外处理
-
       if (
         (renderItem.type == "uploadOss" || renderItem.type == "uploadTos" || renderItem.type == "upload") &&
         renderItem.fieldType == "string"
@@ -95,12 +95,13 @@ const disposeRenderData = async (renderData: FormDataItem[]) => {
         fieldType = "array";
       }
 
+
       if (required) {
         rules.push({
           type: renderItem.type == "uploadOss" || renderItem.type == "uploadTos" ? "array" : renderItem.fieldType,
           required: true,
           message: msg || `请${operateType}${label}`,
-          trigger: "blur",
+          trigger: ["blur", "change"],
         });
       }
       if (min) {
@@ -108,7 +109,7 @@ const disposeRenderData = async (renderData: FormDataItem[]) => {
           type: fieldType,
           min: min,
           message: msg || `${label}需大于等于${min}${fieldType == "string" ? "个字符" : ""}`,
-          trigger: "blur",
+          trigger: ["blur", "change"],
         });
       }
 
@@ -117,10 +118,21 @@ const disposeRenderData = async (renderData: FormDataItem[]) => {
           type: fieldType,
           max: max,
           message: `${label}需小于等于${max}${fieldType == "string" ? "个字符" : ""}`,
-          trigger: "blur",
+          trigger: ["blur", "change"],
+        });
+      }
+      if (regex) {
+        rules.push({
+          type: fieldType,
+          pattern: regex,
+          message: msg || `${label}格式错误`,
+          trigger: ["blur", "change"],
         });
       }
     }
+
+
+
     renderItem.rules = rules;
 
     // 处理下拉选择
@@ -433,47 +445,26 @@ defineExpose({
 </script>
 
 <template>
-  <a-form
-    ref="formRef"
-    :model="formState"
-    name="basic"
-    autocomplete="off"
-    :layout="layout"
-    :required-mark="requiredMark"
-  >
+  <a-form ref="formRef" :model="formState" name="basic" autocomplete="off" :layout="layout"
+    :required-mark="requiredMark">
     <div v-for="(renderItem, index) in renderData">
-      <a-form-item
-        :label-col="{ span: renderItem.hideLabel ? 0 : renderItem.labelSpan || labelSpan }"
+      <a-form-item :label-col="{ span: renderItem.hideLabel ? 0 : renderItem.labelSpan || labelSpan }"
         :wrapper-col="{ span: renderItem.hideLabel ? undefined : renderItem.valueSpan || valueSpan }"
         v-show="!renderItem.visibleHook || (renderItem.visibleHook && renderItem.visibleHook(formState))"
-        :label="renderItem.label && !renderItem.hideLabel ? renderItem.label : ''"
-        :name="renderItem.key"
-        :colon="renderItem.colon == undefined ? true : renderItem.colon"
-        :rules="
-          !renderItem.visibleHook || (renderItem.visibleHook && renderItem.visibleHook(formState))
-            ? renderItem.rules
-            : undefined
-        "
-        :auto-link="false"
-        :style="{
-          marginBottom: isSearchForm ? '20px' : '0px',
-        }"
-        :tooltip="renderItem.tooltip"
-        :label-align="renderItem.labelAlign || 'right'"
-      >
-        <div
-          :style="{
-            pointerEvents: renderItem.disabled ? 'none' : 'auto',
-            opacity: renderItem.disabled ? 0.6 : 1,
-            cursor: renderItem.disabled ? 'not-allowed' : 'auto',
-          }"
-        >
-          <a-input
-            v-model:value="formState[renderItem.key]"
-            v-if="renderItem.type == 'input' && [undefined, 'string'].includes(renderItem.fieldType)"
-            type="text"
-            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
-          >
+        :label="renderItem.label && !renderItem.hideLabel ? renderItem.label : ''" :name="renderItem.key"
+        :colon="renderItem.colon == undefined ? true : renderItem.colon" :rules="!renderItem.visibleHook || (renderItem.visibleHook && renderItem.visibleHook(formState))
+          ? renderItem.rules
+          : undefined
+          " :style="{
+            marginBottom: isSearchForm ? '20px' : '0px',
+          }" :tooltip="renderItem.tooltip" :label-align="renderItem.labelAlign || 'right'">
+        <div :style="{
+          opacity: renderItem.disabled ? 0.6 : 1,
+          cursor: renderItem.disabled ? 'not-allowed' : 'auto',
+        }">
+          <a-input v-model:value="formState[renderItem.key]"
+            v-if="renderItem.type == 'input' && [undefined, 'string'].includes(renderItem.fieldType)" type="text"
+            :disabled="renderItem.disabled" :placeholder="renderItem.placeholder || `请输入${renderItem.label}`">
             <template v-if="renderItem.prefix" v-slot:prefix>
               <component :is="renderItem.prefix" />
             </template>
@@ -482,12 +473,9 @@ defineExpose({
             </template>
           </a-input>
 
-          <a-input
-            v-model:value.number="formState[renderItem.key]"
-            v-if="renderItem.type == 'input' && renderItem.fieldType == 'number'"
-            type="number"
-            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
-          >
+          <a-input v-model:value.number="formState[renderItem.key]"
+            v-if="renderItem.type == 'input' && renderItem.fieldType == 'number'" type="number"
+            :disabled="renderItem.disabled" :placeholder="renderItem.placeholder || `请输入${renderItem.label}`">
             <template v-if="renderItem.prefix" v-slot:prefix>
               <component :is="renderItem.prefix" />
             </template>
@@ -496,35 +484,25 @@ defineExpose({
             </template>
           </a-input>
 
-          <a-input-password
-            v-model:value="formState[renderItem.key]"
-            v-if="renderItem.type == 'password'"
-            type="password"
-            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
-          >
+          <a-input-password v-model:value="formState[renderItem.key]" v-if="renderItem.type == 'password'"
+            type="password" :disabled="renderItem.disabled"
+            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`">
             <template v-if="renderItem.prefix" v-slot:prefix>
               <component :is="renderItem.prefix" />
             </template>
           </a-input-password>
 
-          <a-input
-            v-model:value="formState[renderItem.key]"
-            v-if="renderItem.type == 'code' && [undefined, 'string'].includes(renderItem.fieldType)"
-            type="text"
-            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
-          >
+          <a-input v-model:value="formState[renderItem.key]"
+            v-if="renderItem.type == 'code' && [undefined, 'string'].includes(renderItem.fieldType)" type="text"
+            :disabled="renderItem.disabled" :placeholder="renderItem.placeholder || `请输入${renderItem.label}`">
             <template v-if="renderItem.prefix" v-slot:prefix>
               <component :is="renderItem.prefix" />
             </template>
             <template v-slot:suffix>
-              <span
-                v-if="
-                  (!renderItem.activityFunc || (renderItem.activityFunc && renderItem.activityFunc(formState))) &&
-                  renderItem.sendStatus != 'sending'
-                "
-                class="send-notice send-notice-activity"
-                @click="sendNoticeClick(renderItem)"
-              >
+              <span v-if="
+                (!renderItem.activityFunc || (renderItem.activityFunc && renderItem.activityFunc(formState))) &&
+                renderItem.sendStatus != 'sending'
+              " class="send-notice send-notice-activity" @click="sendNoticeClick(renderItem)">
                 {{ renderItem.codeName }}
               </span>
               <span v-else class="send-notice">
@@ -533,69 +511,44 @@ defineExpose({
             </template>
           </a-input>
 
-          <a-textarea
-            v-model:value="formState[renderItem.key]"
-            v-if="renderItem.type == 'textarea'"
-            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
-            :auto-size="{ minRows: 2, maxRows: 10 }"
-          />
-
-          <a-select
-            style="min-width: 170px; margin-right: 15px"
-            v-model:value="formState[renderItem.key]"
-            :placeholder="renderItem.placeholder || `请选择`"
-            v-if="renderItem.type == 'select'"
-            :fieldNames="renderItem.fieldNames || { label: 'label', value: 'value' }"
-            :options="renderItem.optionList"
-            :mode="renderItem.isMultiple ? 'multiple' : undefined"
-          ></a-select>
-
-          <a-radio-group v-if="renderItem.type == 'radio'" v-model:value="formState[renderItem.key]">
+          <a-textarea v-model:value="formState[renderItem.key]" v-if="renderItem.type == 'textarea'"
+            :disabled="renderItem.disabled" :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
+            :auto-size="{ minRows: 2, maxRows: 10 }" />
+
+          <a-select style="min-width: 170px; margin-right: 15px" v-model:value="formState[renderItem.key]"
+            :placeholder="renderItem.placeholder || `请选择`" v-if="renderItem.type == 'select'"
+            :disabled="renderItem.disabled" :fieldNames="renderItem.fieldNames || { label: 'label', value: 'value' }"
+            :options="renderItem.optionList" :mode="renderItem.isMultiple ? 'multiple' : undefined"></a-select>
+
+          <a-radio-group v-if="renderItem.type == 'radio'" v-model:value="formState[renderItem.key]"
+            :disabled="renderItem.disabled">
             <a-radio v-for="item in renderItem.optionList" :value="item[renderItem.fieldNames?.value || 'value']">
               {{ item[renderItem.fieldNames?.label || "label"] }}
             </a-radio>
           </a-radio-group>
 
-          <a-date-picker
-            v-model:value="formState[renderItem.key]"
-            v-if="renderItem.type === 'datePicker'"
-            show-time
-            :placeholder="`请选择${renderItem.label}`"
-            class="ant-input"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
-
-          <a-tree-select
-            style="min-width: 170px; margin-right: 15px"
-            v-model:value="formState[renderItem.key]"
-            :tree-data="renderItem.optionList"
-            v-if="renderItem.type == 'treeSelect'"
+          <a-date-picker v-model:value="formState[renderItem.key]" v-if="renderItem.type === 'datePicker'" show-time
+            :disabled="renderItem.disabled" :placeholder="`请选择${renderItem.label}`" class="ant-input"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+
+          <a-tree-select style="min-width: 170px; margin-right: 15px" v-model:value="formState[renderItem.key]"
+            :tree-data="renderItem.optionList" v-if="renderItem.type == 'treeSelect'" :disabled="renderItem.disabled"
             :fieldNames="renderItem.fieldNames || { children: 'children', label: 'name', value: 'id' }"
-            :placeholder="renderItem.placeholder || `请选择`"
-          ></a-tree-select>
+            :placeholder="renderItem.placeholder || `请选择`"></a-tree-select>
 
           <a-upload
             v-if="renderItem.type == 'uploadOss' || renderItem.type == 'uploadTos' || renderItem.type == 'upload'"
-            :file-list="formState[renderItem.key]"
-            :multiple="true"
-            :max-count="renderItem?.maxCount || 1"
-            @preview="handlePicPreview"
-            :customRequest="
-              (e) => {
-                uploadRequest(e, renderItem);
-              }
-            "
-            @change="
-              (e) => {
-                uploadChange(e, renderItem);
-              }
-            "
-            :headers="{
-              'Cache-Control': 'max-age=15552000',
-            }"
-            :list-type="renderItem.uploadType == 'pic' ? 'picture-card' : undefined"
-          >
+            :file-list="formState[renderItem.key]" :multiple="true" :max-count="renderItem?.maxCount || 1"
+            @preview="handlePicPreview" :customRequest="(e) => {
+              uploadRequest(e, renderItem);
+            }
+              " @change="
+                (e) => {
+                  uploadChange(e, renderItem);
+                }
+              " :headers="{
+                'Cache-Control': 'max-age=15552000',
+              }" :list-type="renderItem.uploadType == 'pic' ? 'picture-card' : undefined">
             <div v-if="renderItem.uploadType == 'pic'">
               <plus-outlined />
               <div style="margin-top: 8px">{{ renderItem.label }}</div>
@@ -609,8 +562,9 @@ defineExpose({
             </div>
           </a-upload>
 
-          <component v-if="renderItem.type == 'component'" :is="renderItem.component" v-model:[renderItem.key]="formState[renderItem.key]"></component>
-       </div>
+          <component v-if="renderItem.type == 'component'" :is="renderItem.component"
+            v-model:[renderItem.key]="formState[renderItem.key]"></component>
+        </div>
       </a-form-item>
     </div>
 

package/dist/utils/dataUtils.ts

@@ -35,33 +35,77 @@ export const isEmpty = (value: any): boolean => {
 
 
 export const cloneDeep = <T>(value: T, weakMap = new WeakMap()): T => {
-  if (value === null || typeof value !== 'object') return value;
+  // 1. 基础类型直接返回
+  if (value === null || typeof value !== "object") return value;
 
-  if (weakMap.has(value)) return weakMap.get(value); // 解决循环引用
+  // 2. 处理循环引用
+  if (weakMap.has(value as any)) {
+    return weakMap.get(value as any);
+  }
 
   let result: any;
 
+  // 3. RegExp
+  if (value instanceof RegExp) {
+    result = new RegExp(value.source, value.flags);
+    weakMap.set(value, result);
+    return result;
+  }
+
+  // 4. Date
+  if (value instanceof Date) {
+    result = new Date(value.getTime());
+    weakMap.set(value, result);
+    return result;
+  }
+
+  // 5. Map
+  if (value instanceof Map) {
+    result = new Map();
+    weakMap.set(value, result);
+
+    value.forEach((v, k) => {
+      result.set(k, cloneDeep(v, weakMap));
+    });
+
+    return result;
+  }
+
+  // 6. Set
+  if (value instanceof Set) {
+    result = new Set();
+    weakMap.set(value, result);
+
+    value.forEach((v) => {
+      result.add(cloneDeep(v, weakMap));
+    });
+
+    return result;
+  }
+
+  // 7. Array
   if (Array.isArray(value)) {
     result = [];
     weakMap.set(value, result);
+
     for (const item of value) {
       result.push(cloneDeep(item, weakMap));
     }
+
     return result;
   }
 
-  result = {};
+  // 8. 普通对象
+  result = Object.create(Object.getPrototypeOf(value));
   weakMap.set(value, result);
-  for (const key in value) {
-    if (Object.prototype.hasOwnProperty.call(value, key)) {
-      result[key] = cloneDeep(value[key], weakMap);
-    }
+
+  for (const key of Object.keys(value as any)) {
+    result[key] = cloneDeep((value as any)[key], weakMap);
   }
 
   return result;
 };
 
-
 export const isArray = (value: any) => {
   return Array.isArray(value);
 };
@@ -134,21 +178,3 @@ const paramsToString = (params) => {
   return url
 }
 
-
-export const navTo = (url, params = {}) => {
-  uni.navigateTo({ url: url + paramsToString(params) })
-}
-
-
-export const dirTo = (url, params = {}) => {
-  uni.redirectTo({ url: url + paramsToString(params) })
-}
-
-export const switchTo = (url) => {
-  uni.switchTab({ url })
-}
-
-export const backTo = (delta = 1) => {
-  uni.navigateBack({ delta })
-}
-

package/package.json

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