@skyfox2000/webui 1.4.7 → 1.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.4.7",
+   "version": "1.4.9",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],

package/src/components/common/icon/helper.vue

@@ -2,11 +2,13 @@
 import { Popover } from 'ant-design-vue';
 import ToolIcon from './toolIcon.vue';
 import { useAttrs } from 'vue';
+import { TooltipPlacement } from 'ant-design-vue/es/tooltip';
 
 defineProps<{
    text?: string;
    maxWidth?: string;
    size?: number;
+   placement?: TooltipPlacement;
 }>();
 // 关闭自动继承属性到根元素
 defineOptions({
@@ -16,7 +18,7 @@ const attrs = useAttrs(); // 手动获取 $attrs
 </script>
 
 <template>
-   <Popover placement="topRight">
+   <Popover :placement="placement ?? 'topRight'">
       <template #content>
          <slot>
             <div class="text-[14px]" :class="[maxWidth]">

package/src/components/content/dialog/index.vue

@@ -100,19 +100,21 @@ const doDialogClose = () => {
          <slot></slot>
       </div>
       <template #footer>
-         <Space>
-            <Button @click="doDialogClose" v-if="cancelText !== ''">
-               {{ cancelText ?? '取消' }}
-            </Button>
-            <Button @click="doDialogSaveAs" v-if="saveAsText !== '' && editorCtrl?.saveAsBtnVisible !== false"
-               type="primary" :loading="editorCtrl?.isFormSaving.value">
-               {{ saveAsText ?? '另存为' }}
-            </Button>
-            <Button @click="doDialogSave" v-if="saveText !== '' && editorCtrl?.saveBtnVisible !== false" type="primary"
-               :loading="editorCtrl?.isFormSaving.value">
-               {{ saveText ?? '保存' }}
-            </Button>
-         </Space>
+         <slot name="footer">
+            <Space>
+               <Button @click="doDialogClose" v-if="cancelText !== ''">
+                  {{ cancelText ?? '取消' }}
+               </Button>
+               <Button @click="doDialogSaveAs" v-if="saveAsText !== '' && editorCtrl?.saveAsBtnVisible !== false"
+                  type="primary" :loading="editorCtrl?.isFormSaving.value">
+                  {{ saveAsText ?? '另存为' }}
+               </Button>
+               <Button @click="doDialogSave" v-if="saveText !== '' && editorCtrl?.saveBtnVisible !== false"
+                  type="primary" :loading="editorCtrl?.isFormSaving.value">
+                  {{ saveText ?? '保存' }}
+               </Button>
+            </Space>
+         </slot>
       </template>
    </Modal>
 </template>

package/src/components/content/drawer/index.vue

@@ -74,65 +74,43 @@ const doDrawerClose = () => {
 };
 </script>
 <template>
-   <Drawer
-      v-model:open="open"
-      :get-container="false"
-      :closable="false"
-      :header-style="{
-         height: '40px',
-         padding: '10px 6px 10px 16px',
-         backgroundColor: token.colorBgLayout,
-      }"
-      :body-style="{
-         padding: '10px 16px',
-      }"
-      :footer-style="{
-         textAlign: 'right',
-      }"
-      :style="{
+   <Drawer v-model:open="open" :get-container="false" :closable="false" :header-style="{
+      height: '40px',
+      padding: '10px 6px 10px 16px',
+      backgroundColor: token.colorBgLayout,
+   }" :body-style="{
+      padding: '10px 16px',
+   }" :footer-style="{
+      textAlign: 'right',
+   }" :style="{
          position: 'absolute',
          boxShadow: 'rgba(0, 0, 0, 0.3) -2px 0px 8px',
-      }"
-      width="420px"
-      @close="doDrawerClose"
-   >
+      }" width="420px" @close="doDrawerClose">
       <template #extra>
-         <div class="hover:bg-gray-200 w-[24px] h-[24px] rounded-md">
-            <ToolIcon
-               class="top-[-2px] left-[2px] w-6 h-6"
-               icon="icon-new"
-               :angle="45"
-               fontsize="24px"
-               clickable
-               color="#666"
-               :position="[0, 0]"
-               @click="doDrawerClose"
-            />
-         </div>
+         <slot name="extra">
+            <div class="hover:bg-gray-200 w-[24px] h-[24px] rounded-md">
+               <ToolIcon class="top-[-2px] left-[2px] w-6 h-6" icon="icon-new" :angle="45" fontsize="24px" clickable
+                  color="#666" :position="[0, 0]" @click="doDrawerClose" />
+            </div>
+         </slot>
       </template>
       <template #default>
          <slot></slot>
       </template>
       <template #footer>
-         <Space>
-            <Button @click="doDrawerClose" v-if="cancelText !== ''">{{ cancelText ?? '取消' }}</Button>
-            <Button
-               @click="doDrawerSaveAs"
-               v-if="saveAsText !== '' && editorCtrl.saveAsBtnVisible !== false"
-               type="primary"
-               :loading="editorCtrl.isFormSaving.value"
-            >
-               {{ saveAsText ?? '另存为' }}
-            </Button>
-            <Button
-               @click="doDrawerSave"
-               v-if="saveText !== '' && editorCtrl.saveBtnVisible !== false"
-               type="primary"
-               :loading="editorCtrl.isFormSaving.value"
-            >
-               {{ saveText ?? '保存' }}
-            </Button>
-         </Space>
+         <slot name="footer">
+            <Space>
+               <Button @click="doDrawerClose" v-if="cancelText !== ''">{{ cancelText ?? '取消' }}</Button>
+               <Button @click="doDrawerSaveAs" v-if="saveAsText !== '' && editorCtrl.saveAsBtnVisible !== false"
+                  type="primary" :loading="editorCtrl.isFormSaving.value">
+                  {{ saveAsText ?? '另存为' }}
+               </Button>
+               <Button @click="doDrawerSave" v-if="saveText !== '' && editorCtrl.saveBtnVisible !== false"
+                  type="primary" :loading="editorCtrl.isFormSaving.value">
+                  {{ saveText ?? '保存' }}
+               </Button>
+            </Space>
+         </slot>
       </template>
    </Drawer>
 </template>

package/src/components/form/propEditor/index.vue

@@ -80,15 +80,29 @@ watch(
 );
 
 const updateConfig = () => {
-   const newConfig = configList.value.reduce(
-      (acc: Record<string, string>, item: PropConfigItem) => {
+   let newConfig: Record<string, string>;
+   
+   if (props.selectList && props.selectList.length > 0) {
+      // 有selectList时，只更新selectList中定义的字段，保留其他字段不变
+      newConfig = { ...props.value };
+      configList.value.forEach((item: PropConfigItem) => {
          if (item.field) {
-            acc[item.field] = item.value;
+            newConfig[item.field] = item.value;
          }
-         return acc;
-      },
-      {} as Record<string, string>,
-   );
+      });
+   } else {
+      // 没有selectList时，更新所有字段
+      newConfig = configList.value.reduce(
+         (acc: Record<string, string>, item: PropConfigItem) => {
+            if (item.field) {
+               acc[item.field] = item.value;
+            }
+            return acc;
+         },
+         {} as Record<string, string>,
+      );
+   }
+   
    isInnerChange = true;
    emit('update:value', newConfig);
 };

package/src/components/form/select/index.vue

@@ -89,7 +89,7 @@ const onChanged = (value: any) => {
    innerValue.value = value;
    emit('update:labels', labels);
    emit('update:label', labels.join(";"));
-   emit('change', value);
+   emit('change', value, selectedOptions);
 
    if (errInfo?.value.errClass && editorCtrl) {
       /// 重新开始验证

package/lib/assets/modules/index-B1MSCuqH.js

@@ -1,112 +0,0 @@
-import { defineComponent as F, provide as _, ref as w, watch as p, onMounted as B, createBlock as n, openBlock as r, unref as a, withCtx as i, createElementVNode as N, renderSlot as b, createVNode as V, createCommentVNode as d, createTextVNode as u, toDisplayString as v } from "vue";
-import { _ as m } from "./index-BLNKcgk-.js";
-import { Modal as D, Space as E } from "ant-design-vue";
-import "@skyfox2000/fapi";
-import { P as M, d as P, o as $, b as K } from "./uploadList-DafDrGgh.js";
-import "@skyfox2000/microbase";
-import "vue-m-message";
-import "async-validator";
-import "dayjs";
-import "vue-draggable-next";
-const U = { class: "overflow-y-auto w-full h-full" }, R = /* @__PURE__ */ F({
-  __name: "index",
-  props: {
-    saveText: {},
-    saveAsText: {},
-    cancelText: {},
-    editorCtrl: {},
-    dialogSave: { type: Function },
-    dialogSaveAs: { type: Function },
-    width: {},
-    full: { type: Boolean },
-    open: { type: Boolean }
-  },
-  emits: ["update:open"],
-  setup(C, { emit: T }) {
-    const l = C, e = l.editorCtrl;
-    _(M.EditorControl, e);
-    const t = w(l.open ?? !1), A = T, h = w(l.width ?? 430);
-    p(
-      () => e == null ? void 0 : e.visible.value,
-      (o) => {
-        t.value = o ?? !1;
-      }
-    ), p(
-      () => l.open,
-      (o) => {
-        t.value = o;
-      }
-    ), p(
-      () => t.value,
-      (o) => {
-        A("update:open", o), o || f();
-      }
-    ), B(() => {
-      t.value = (e == null ? void 0 : e.visible.value) ?? !1;
-    });
-    const k = () => {
-      l.dialogSave ? l.dialogSave() : e && $(e);
-    }, x = () => {
-      l.dialogSaveAs ? l.dialogSaveAs() : e && K(e);
-    }, f = () => {
-      e ? P(e) : t.value = !1;
-    };
-    return (o, c) => (r(), n(a(D), {
-      open: t.value,
-      "onUpdate:open": c[0] || (c[0] = (s) => t.value = s),
-      wrapClassName: "modal mx-auto min-w-[430px] " + (o.full ? "full-modal w-full" : ""),
-      width: h.value
-    }, {
-      footer: i(() => [
-        V(a(E), null, {
-          default: i(() => {
-            var s, g, S, y;
-            return [
-              o.cancelText !== "" ? (r(), n(a(m), {
-                key: 0,
-                onClick: f
-              }, {
-                default: i(() => [
-                  u(v(o.cancelText ?? "取消"), 1)
-                ]),
-                _: 1
-              })) : d("", !0),
-              o.saveAsText !== "" && ((s = a(e)) == null ? void 0 : s.saveAsBtnVisible) !== !1 ? (r(), n(a(m), {
-                key: 1,
-                onClick: x,
-                type: "primary",
-                loading: (g = a(e)) == null ? void 0 : g.isFormSaving.value
-              }, {
-                default: i(() => [
-                  u(v(o.saveAsText ?? "另存为"), 1)
-                ]),
-                _: 1
-              }, 8, ["loading"])) : d("", !0),
-              o.saveText !== "" && ((S = a(e)) == null ? void 0 : S.saveBtnVisible) !== !1 ? (r(), n(a(m), {
-                key: 2,
-                onClick: k,
-                type: "primary",
-                loading: (y = a(e)) == null ? void 0 : y.isFormSaving.value
-              }, {
-                default: i(() => [
-                  u(v(o.saveText ?? "保存"), 1)
-                ]),
-                _: 1
-              }, 8, ["loading"])) : d("", !0)
-            ];
-          }),
-          _: 1
-        })
-      ]),
-      default: i(() => [
-        N("div", U, [
-          b(o.$slots, "default")
-        ])
-      ]),
-      _: 3
-    }, 8, ["open", "wrapClassName", "width"]));
-  }
-});
-export {
-  R as _
-};