@10yun/cv-pc-ui 0.4.6 → 0.4.8

package/lib/cv-ui.js

@@ -1,4 +1,4 @@
-/*! cvPcUI v0.4.6 */
+/*! cvPcUI v0.4.8 */
 import { ClickOutside as e, ElAutocomplete as t, ElAvatar as n, ElBadge as r, ElButton as i, ElButton as a, ElCascader as o, ElCheckbox as s, ElCheckboxButton as c, ElCheckboxGroup as l, ElDatePicker as u, ElDialog as d, ElDrawer as f, ElForm as p, ElFormItem as m, ElIcon as ee, ElImage as te, ElInput as ne, ElInput as h, ElInputNumber as re, ElMessage as ie, ElMessage as g, ElMessageBox as ae, ElMessageBox as oe, ElOption as se, ElPagination as ce, ElPopover as le, ElScrollbar as ue, ElSelect as de, ElSwitch as fe, ElTable as pe, ElTableColumn as _, ElTag as me, ElTimePicker as he } from "element-plus";
 import { Fragment as v, Transition as ge, TransitionGroup as _e, computed as ve, createBlock as y, createCommentVNode as b, createElementBlock as x, createElementVNode as S, createSlots as ye, createTextVNode as C, createVNode as w, defineComponent as be, getCurrentInstance as xe, getCurrentScope as Se, guardReactiveProps as T, h as Ce, inject as we, markRaw as Te, mergeProps as E, nextTick as Ee, normalizeClass as D, normalizeProps as O, normalizeStyle as k, onBeforeUnmount as De, onMounted as Oe, onScopeDispose as ke, onUnmounted as Ae, openBlock as A, provide as je, reactive as Me, ref as j, render as Ne, renderList as M, renderSlot as N, resolveComponent as P, resolveDirective as Pe, resolveDynamicComponent as Fe, shallowReadonly as Ie, shallowRef as Le, toDisplayString as F, toHandlers as Re, toRaw as ze, toRefs as Be, toValue as Ve, unref as I, useCssVars as He, useSlots as Ue, vModelText as We, vShow as L, watch as Ge, withCtx as R, withDirectives as z, withKeys as Ke, withModifiers as qe } from "vue";
 import { basicSetup as Je } from "codemirror";
@@ -3805,6 +3805,9 @@ var fa = {
 		};
 	},
 	computed: {
+		isMultiValue() {
+			return !!this.multiple || parseInt(this.allowFileNum) > 1;
+		},
 		fileTypeStr() {
 			return this.allowFileType.join(",");
 		},
@@ -3817,7 +3820,7 @@ var fa = {
 				fileSize: this.allowFileSize || "",
 				fileUnit: this.fileUnit,
 				multiple: this?.multiple || !1,
-				limit: this.allowFileNum ? parseInt(this.allowFileNum) : 5
+				limit: this.allowFileNum ? parseInt(this.allowFileNum) : 1
 			};
 		},
 		mergeAttrs() {
@@ -4401,11 +4404,11 @@ function Na(e) {
 }
 function Pa(e, t) {
 	let n = [];
-	Array.isArray(e) && e.length > 0 && n.push(...e), Array.isArray(t) && t.length > 0 && n.push(...t), typeof t == "string" && n.push(t);
+	Array.isArray(e) && e.length > 0 && n.push(...e), Array.isArray(t) && t.length > 0 && n.push(...t), (typeof t == "string" || typeof t == "number") && n.push(t);
 	let r = [];
 	for (let e in n) {
 		let t = n[e], i = Object.prototype.toString.call(t);
-		i === "[object String]" ? r.push(t) : i === "[object Object]" && t.url && r.push(t.url);
+		i === "[object String]" ? r.push(t) : i === "[object Number]" ? r.push(String(t)) : i === "[object Object]" && t.url && r.push(t.url);
 	}
 	return r;
 }
@@ -4557,11 +4560,11 @@ var Fa = {
 			}
 		},
 		updateValue(e, t) {
-			if (this.multiple) {
+			if (this.isMultiValue) {
 				let t = Pa(this.localValue, e).join(",");
 				this.$emit("update:modelValue", t);
 			} else this.$emit("update:modelValue", e);
-			if (this.multiple) {
+			if (this.isMultiValue) {
 				let e = Pa(this.localList, t);
 				this.$emit("update:initValue", e);
 			} else this.$emit("update:initValue", t);
@@ -4570,11 +4573,11 @@ var Fa = {
 			e.raw, e.type.includes("image") ? (this.previewTitle = e.name, this.previewUrl = e.url, this.previewShow = !0) : window.open(e.url);
 		},
 		doRemove(e) {
-			this.multiple ? (this.localValue = this.localValue.filter((t, n) => n !== e), this.localList = this.localList.filter((t, n) => n !== e)) : (this.localValue = "", this.localList = []), this.updateValue(null, null);
+			this.isMultiValue ? (this.localValue = this.localValue.filter((t, n) => n !== e), this.localList = this.localList.filter((t, n) => n !== e)) : (this.localValue = "", this.localList = []), this.updateValue(null, null);
 		},
 		handleItemRemove(e, t) {
 			if (this.beforeRemove && typeof this.beforeRemove == "function") {
-				let e = this.multiple ? this.localValue[t] : this.localValue, n = this.beforeRemove(e, this.localValue);
+				let e = this.isMultiValue ? this.localValue[t] : this.localValue, n = this.beforeRemove(e, this.localValue);
 				n && n.then ? n.then(() => {
 					this.doRemove(t);
 				}, () => {}) : n !== !1 && this.doRemove(t);
@@ -4922,7 +4925,7 @@ var to = {
 		},
 		allowFileNum: {
 			type: [Number],
-			default: 5
+			default: 1
 		},
 		multiple: {
 			type: [Boolean],
@@ -5002,7 +5005,7 @@ var to = {
 			}
 		},
 		updateValue(e, t) {
-			if (this.multiple) {
+			if (this.isMultiValue) {
 				let n = Pa(this.localValue, e), r = Pa(this.localList, t);
 				this.$emit("update:modelValue", n), this.$emit("update:initValue", r);
 			} else this.$emit("update:modelValue", e || ""), this.$emit("update:initValue", t || "");
@@ -5017,7 +5020,7 @@ var to = {
 		},
 		_do_remove(e) {
 			let t = this.localList[e];
-			if (this.$emit("remove", t, this.localList), this.multiple) {
+			if (this.$emit("remove", t, this.localList), this.isMultiValue) {
 				let t = this.localValue.filter((t, n) => n !== e), n = this.localList.filter((t, n) => n !== e).map((e) => e.url);
 				this.$emit("update:modelValue", t), this.$emit("update:initValue", n);
 			} else this.$emit("update:modelValue", ""), this.$emit("update:initValue", "");
@@ -13217,7 +13220,7 @@ function nm(e, t, n, r, i, a) {
 		class: "tinymce-textarea"
 	}, null, 8, tm)], 6);
 }
-var rm = /*#__PURE__*/ H(em, [["render", nm], ["__scopeId", "data-v-16673ff9"]]), im = {
+var rm = /*#__PURE__*/ H(em, [["render", nm], ["__scopeId", "data-v-681627a2"]]), im = {
 	name: "cvEditorMarkdown",
 	mixins: [
 		ap,
@@ -14883,22 +14886,17 @@ var yg = class {
 					onClick: e.clickFn
 				}, e.text)));
 				let a = function(t) {
-					e.close();
+					t || e.close();
 				}, o = typeof e.boxOptions.beforeClose == "function" ? e.boxOptions.beforeClose : a;
 				return w(d, {
 					...e.boxProps.value,
 					modelValue: e.boxShow.value,
 					beforeClose: (t) => {
-						e.boxOptions.closeIsConfirm ? ae.confirm("确认关闭？", "提示").then((e) => {
+						typeof e.boxOptions.beforeClose == "function" ? o(a) : e.boxOptions.closeIsConfirm ? ae.confirm("确认关闭？", "提示").then((e) => {
 							o(a);
-						}).catch((e) => {
-							a();
-						}) : o(a);
+						}).catch((e) => {}) : o(a);
 					},
-					onClosed2(t) {
-						e.close();
-					},
-					onClosed: e.close
+					onClosed: () => e._destroyVm()
 				}, { default: () => t });
 			}
 		};
@@ -14909,7 +14907,10 @@ var yg = class {
 		r.appContext = this.WinVue._context, Ne(r, this.vmTargetElement), this.vmApp = r;
 	}
 	close() {
-		this.boxShow && (this.boxShow.value = !1), this.vmTargetElement && (Ne(null, this.vmTargetElement), document.body.removeChild(this.vmTargetElement), this.vmApp = null);
+		this.boxShow.value ? this.boxShow.value = !1 : this._destroyVm();
+	}
+	_destroyVm() {
+		this.vmApp && this.vmTargetElement && (Ne(null, this.vmTargetElement), document.body.removeChild(this.vmTargetElement), this.vmApp = null);
 	}
 	show() {
 		this.boxShow.value = !0;
@@ -14995,22 +14996,17 @@ var xg = class {
 					onClick: e.clickFn
 				}, e.text)));
 				let a = function(t) {
-					e.close();
+					t || e.close();
 				}, o = typeof e.boxOptions.beforeClose == "function" ? e.boxOptions.beforeClose : a;
 				return w(f, {
 					...e.boxProps.value,
 					modelValue: e.boxShow.value,
 					beforeClose: (t) => {
-						e.boxOptions.closeIsConfirm ? ae.confirm("确认关闭？", "提示").then((e) => {
+						typeof e.boxOptions.beforeClose == "function" ? o(a) : e.boxOptions.closeIsConfirm ? ae.confirm("确认关闭？", "提示").then((e) => {
 							o(a);
-						}).catch((e) => {
-							a();
-						}) : o(a);
+						}).catch((e) => {}) : o(a);
 					},
-					onClosed2(e) {
-						this.clearVm();
-					},
-					onClosed: this.clearVm
+					onClosed: () => e._destroyVm()
 				}, { default: () => t });
 			}
 		};
@@ -15021,7 +15017,10 @@ var xg = class {
 		r.appContext = this.WinVue._context, Ne(r, this.vmTargetElement), this.vmApp = r;
 	}
 	close() {
-		this.boxShow.value = !1, Ne(null, this.vmTargetElement);
+		this.boxShow.value ? this.boxShow.value = !1 : this._destroyVm();
+	}
+	_destroyVm() {
+		this.vmApp &&= (Ne(null, this.vmTargetElement), null);
 	}
 	show() {
 		this.boxShow.value = !0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-pc-ui",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "private": false,
   "description": "cvjs-pc-ui组件",
   "homepage": "http://cvjs.cn/cv-pc-ui",
@@ -84,7 +84,7 @@
     "@vitejs/plugin-vue": "^6.0.10",
     "rollup-plugin-visualizer": "^7.1.1",
     "vite": "8.3.5",
-    "vue-tsc": "^3.3.13"
+    "vue-tsc": "^3.3.14"
   },
   "peerDependencies": {
     "element-plus": "^2"

package/src/utils/value.js

@@ -12,6 +12,14 @@ export function content_to_value(valDef) {
     return [];
   }
 }
+/**
+ * 值归并：把「已有列表」与「本次新增」合成一维的值数组（ID 或 url）
+ * ⚠️ 数字 ID 必须收下：后端 filelog_id 是整型，而多值字段的 modelValue 全靠这里重算
+ * （删除走 updateValue(null, null) → array_to_value(localValue, null)），
+ * 原来只认 [object String] 会把整列数字 ID 静默丢光 → 抛出的逗号串变成 '' →
+ * 表现为「多值时删一张，值全部清空」；连续上传第二张也会丢（array2 只判 string）
+ * 统一转字符串输出，与 content_to_value 的 number 分支口径保持一致
+ */
 export function array_to_value(array1, array2) {
   let newArr = [];
   if (Array.isArray(array1) && array1.length > 0) {
@@ -20,7 +28,7 @@ export function array_to_value(array1, array2) {
   if (Array.isArray(array2) && array2.length > 0) {
     newArr.push(...array2);
   }
-  if (typeof array2 == 'string') {
+  if (typeof array2 == 'string' || typeof array2 == 'number') {
     newArr.push(array2);
   }
   let lastArr = [];
@@ -29,6 +37,8 @@ export function array_to_value(array1, array2) {
     let newType = Object.prototype.toString.call(newItem);
     if (newType === '[object String]') {
       lastArr.push(newItem);
+    } else if (newType === '[object Number]') {
+      lastArr.push(String(newItem));
     } else if (newType === '[object Object]') {
       if (newItem.url) {
         lastArr.push(newItem.url);