yuang-framework-ui-pc 1.1.139 → 1.1.141

package/es/yu-framework-attachment-upload/index.d.ts

@@ -6,7 +6,9 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: import('vue').PropType<{}>;
         default: any;
     };
-}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+}>, {
+    getAttachmentList: () => any;
+}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     change: (frameworkAttachment: FrameworkAttachment) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     modelValue: import('vue').PropType<string>;

package/es/yu-framework-attachment-upload/index.js

@@ -3,8 +3,8 @@ import { ElMessageBox } from "element-plus/es";
 import { EleMessage } from "../utils/message";
 import EleUploadList from "../ele-upload-list/index";
 import { http } from "yuang-framework-ui-common/lib/config/httpConfig";
-import { application } from "yuang-framework-ui-common/lib/config/applicationConfig";
 import * as imageConversion from "image-conversion";
+import { deepClone } from "yuang-framework-ui-common/lib/utils/objectUtils";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "YuFrameworkAttachmentUpload" },
   __name: "index",
@@ -15,7 +15,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     "modelModifiers": {}
   }),
   emits: /* @__PURE__ */ mergeModels(["change"], ["update:modelValue"]),
-  setup(__props, { emit: __emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
     const modelValue = useModel(__props, "modelValue");
@@ -209,6 +209,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleRetryUpload = (uploadItem) => {
       handleUpload(uploadItem, true);
     };
+    const getAttachmentList = () => {
+      return deepClone(fileList.value);
+    };
     watch(
       () => componentParam,
       () => {
@@ -217,6 +220,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       },
       { deep: true, immediate: true }
     );
+    __expose({
+      getAttachmentList
+    });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(EleUploadList, {
         drag: true,

package/es/yu-uims-organization-dialog/components/organization-dialog.js

@@ -5,7 +5,6 @@ import { Close, Check } from "@element-plus/icons-vue";
 import { handleUimsOrganizationTreeDefaultExpandNode } from "yuang-framework-ui-common/lib/hooks/uims/uimsOrganization";
 import { getShortUuid } from "yuang-framework-ui-common/lib/utils/uuidUtils";
 import { http } from "yuang-framework-ui-common/lib/config/httpConfig";
-import { application } from "yuang-framework-ui-common/lib/config/applicationConfig";
 const _hoisted_1 = { style: { "padding": "0 16px 12px 0" } };
 const _hoisted_2 = { class: "yu-dialog-tag" };
 const _sfc_main = /* @__PURE__ */ defineComponent({

package/es/yu-uims-organization-dialog/index.d.ts

@@ -1,33 +1,42 @@
 import { UimsOrganization } from 'yuang-framework-ui-common/lib/interface/uims/uimsOrganization';
 
-declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<string>;
-    param: {
-        type: import('vue').PropType<{
-            isMultiple?: boolean;
-            isShowInput?: boolean;
-        }>;
-        default: any;
-    };
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
+    modelValue: String;
+    param?: object;
 }>, {
+    modelValue: any;
+    param: any;
+}>>, {
     showDialog: () => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     change: (uimsOrganizationList: UimsOrganization[]) => void;
-}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<string>;
-    param: {
-        type: import('vue').PropType<{
-            isMultiple?: boolean;
-            isShowInput?: boolean;
-        }>;
-        default: any;
-    };
-}>> & Readonly<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
+    modelValue: String;
+    param?: object;
+}>, {
+    modelValue: any;
+    param: any;
+}>>> & Readonly<{
     onChange?: ((uimsOrganizationList: UimsOrganization[]) => any) | undefined;
 }>, {
-    param: {
-        isMultiple?: boolean;
-        isShowInput?: boolean;
-    };
+    param: object;
+    modelValue: String;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToRuntimeProps<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+type __VLS_Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/es/yu-uims-organization-dialog/index.js

@@ -1,124 +1,51 @@
-import { defineComponent, mergeModels, useModel, ref, computed, watch, resolveComponent, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, unref } from "vue";
-import { EleMessage } from "../utils/message";
+import { defineComponent, resolveComponent, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, unref, isRef } from "vue";
 import OrganizationDialog from "./components/organization-dialog";
 import { Select } from "@element-plus/icons-vue";
 import { http } from "yuang-framework-ui-common/lib/config/httpConfig";
-import { application } from "yuang-framework-ui-common/lib/config/applicationConfig";
+import { useFrameworkBaseDialog } from "yuang-framework-ui-common/lib/hooks/framework/frameworkBaseDialogHooks";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "YuUimsOrganizationDialog" },
   __name: "index",
-  props: /* @__PURE__ */ mergeModels({
+  props: {
+    modelValue: { default: "" },
     param: { default: {} }
-  }, {
-    "modelValue": {},
-    "modelModifiers": {}
-  }),
-  emits: /* @__PURE__ */ mergeModels(["change"], ["update:modelValue"]),
+  },
+  emits: ["change"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const modelValue = useModel(__props, "modelValue");
-    const initList = ref([]);
-    const inputValue = ref("");
-    const isShowDialog = ref(false);
-    const isInitSuccess = ref(false);
-    const componentParam = computed(() => ({
-      modelValue: modelValue.value,
-      isMultiple: true,
-      isShowInput: true,
-      isDisabled: false,
-      isReadonly: false,
-      ...props.param,
-      initList: initList.value
-    }));
-    const init = async () => {
-      inputValue.value = "";
-      initList.value = [];
-      if (modelValue.value) {
-        if (!componentParam.value.isMultiple) {
-          if (modelValue.value != "0") {
-            let res = await http.get(`/uims-api/admin/uims-organization/selectInfo`, { params: { id: modelValue.value } });
-            const info = res.data.data;
-            inputValue.value = info.name;
-            initList.value = [info];
-          }
-        } else {
-          let idList = modelValue.value.split("|").filter((item) => item.trim() !== "");
-          if (idList.length > 0) {
-            let res = await http.post(`/uims-api/admin/uims-organization/selectInfoList`, idList);
-            const infoList = res.data.data;
-            let names = "";
-            for (let index in infoList) {
-              names += infoList[index].name + "、";
-            }
-            inputValue.value = names.substring(0, names.length - 1);
-            initList.value = infoList;
-          }
-        }
-      }
-      isInitSuccess.value = true;
-    };
-    const showDialog = () => {
-      isShowDialog.value = true;
-    };
-    const hideDialog = () => {
-      if (!isInitSuccess.value) {
-        EleMessage.warning("请等待初始化成功");
-        return;
-      }
-      isShowDialog.value = false;
-    };
-    const handleChange = (selections) => {
-      console.log("selections", selections);
-      modelValue.value = "";
-      inputValue.value = "";
-      if (selections.length > 0) {
-        if (!componentParam.value.isMultiple) {
-          modelValue.value = selections[0].id;
-          inputValue.value = selections[0].name;
-        } else {
-          let modelValueValue = "";
-          let inputValueValue = "";
-          for (let index in selections) {
-            modelValueValue += selections[index].id + "|";
-            inputValueValue += selections[index].name + "、";
-          }
-          modelValue.value = "|" + modelValueValue;
-          inputValue.value = inputValueValue.substring(0, inputValueValue.length - 1);
-        }
-      }
-      emit("change", selections);
-      hideDialog();
-    };
-    watch(
-      () => componentParam.value.modelValue,
-      () => {
-        init();
+    const { inputValue, isShowDialog, componentParam, showDialog, handleChange } = useFrameworkBaseDialog(props, emit, {
+      selectInfo: async (id) => {
+        const res = await http.get(`/uims-api/admin/uims-organization/selectInfo`, { params: { id } });
+        return res.data.data;
       },
-      { immediate: true }
-    );
+      selectInfoList: async (idList) => {
+        const res = await http.post(`/uims-api/admin/uims-organization/selectInfoList`, idList);
+        return res.data.data;
+      }
+    });
     __expose({
       showDialog
     });
     return (_ctx, _cache) => {
       const _component_el_input = resolveComponent("el-input");
       return openBlock(), createElementBlock(Fragment, null, [
-        componentParam.value.isShowInput ? (openBlock(), createBlock(_component_el_input, {
+        unref(componentParam).isShowInput ? (openBlock(), createBlock(_component_el_input, {
           key: 0,
-          modelValue: inputValue.value,
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => inputValue.value = $event),
+          modelValue: unref(inputValue),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(inputValue) ? inputValue.value = $event : null),
           "suffix-icon": unref(Select),
-          disabled: componentParam.value.isDisabled,
-          readonly: componentParam.value.isReadonly,
-          onClick: showDialog
-        }, null, 8, ["modelValue", "suffix-icon", "disabled", "readonly"])) : createCommentVNode("", true),
-        isShowDialog.value ? (openBlock(), createBlock(OrganizationDialog, {
+          disabled: unref(componentParam).isDisabled,
+          readonly: unref(componentParam).isReadonly,
+          onClick: unref(showDialog)
+        }, null, 8, ["modelValue", "suffix-icon", "disabled", "readonly", "onClick"])) : createCommentVNode("", true),
+        unref(isShowDialog) ? (openBlock(), createBlock(OrganizationDialog, {
           key: 1,
-          modelValue: isShowDialog.value,
-          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isShowDialog.value = $event),
-          param: componentParam.value,
-          onChange: handleChange
-        }, null, 8, ["modelValue", "param"])) : createCommentVNode("", true)
+          modelValue: unref(isShowDialog),
+          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(isShowDialog) ? isShowDialog.value = $event : null),
+          param: unref(componentParam),
+          onChange: unref(handleChange)
+        }, null, 8, ["modelValue", "param", "onChange"])) : createCommentVNode("", true)
       ], 64);
     };
   }

package/es/yu-uims-role-dialog/index.d.ts

@@ -1,33 +1,42 @@
 import { UimsRole } from 'yuang-framework-ui-common/lib/interface/uims/uimsRole';
 
-declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<string>;
-    param: {
-        type: import('vue').PropType<{
-            isMultiple?: boolean;
-            isShowInput?: boolean;
-        }>;
-        default: any;
-    };
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
+    modelValue: String;
+    param?: object;
 }>, {
-    showDialog: () => Promise<void>;
+    modelValue: any;
+    param: any;
+}>>, {
+    showDialog: () => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     change: (uimsRoleList: UimsRole[]) => void;
-}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<string>;
-    param: {
-        type: import('vue').PropType<{
-            isMultiple?: boolean;
-            isShowInput?: boolean;
-        }>;
-        default: any;
-    };
-}>> & Readonly<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
+    modelValue: String;
+    param?: object;
+}>, {
+    modelValue: any;
+    param: any;
+}>>> & Readonly<{
     onChange?: ((uimsRoleList: UimsRole[]) => any) | undefined;
 }>, {
-    param: {
-        isMultiple?: boolean;
-        isShowInput?: boolean;
-    };
+    modelValue: String;
+    param: object;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToRuntimeProps<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+type __VLS_Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/es/yu-uims-role-dialog/index.js

@@ -1,126 +1,55 @@
-import { defineComponent, mergeModels, useModel, ref, computed, watch, resolveComponent, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, unref } from "vue";
-import { EleMessage } from "../utils/message";
+import { defineComponent, resolveComponent, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, unref, isRef } from "vue";
 import RoleDialog from "./components/role-dialog";
 import { Select } from "@element-plus/icons-vue";
 import { http } from "yuang-framework-ui-common/lib/config/httpConfig";
+import { useFrameworkBaseDialog } from "yuang-framework-ui-common/lib/hooks/framework/frameworkBaseDialogHooks";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "YuUimsRoleDialog" },
   __name: "index",
-  props: /* @__PURE__ */ mergeModels({
+  props: {
+    modelValue: { default: "" },
     param: { default: {} }
-  }, {
-    "modelValue": {},
-    "modelModifiers": {}
-  }),
-  emits: /* @__PURE__ */ mergeModels(["change"], ["update:modelValue"]),
+  },
+  emits: ["change"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const modelValue = useModel(__props, "modelValue");
-    const initList = ref([]);
-    const inputValue = ref("");
-    const isShowDialog = ref(false);
-    const isInitSuccess = ref(false);
-    const componentParam = computed(() => ({
-      modelValue: modelValue.value,
-      isMultiple: true,
-      isShowInput: true,
-      isDisabled: false,
-      isReadonly: false,
-      // 是否禁止选择已存在用户的角色
-      isDisableSelectRoleOfExistsUser: true,
-      ...props.param,
-      initList: initList.value
-    }));
-    const init = async () => {
-      inputValue.value = "";
-      initList.value = [];
-      if (modelValue.value) {
-        if (!componentParam.value.isMultiple) {
-          if (modelValue.value != "0") {
-            let res = await http.get(`/uims-api/admin/uims-role/selectInfo`, { params: { id: modelValue.value } });
-            const info = res.data.data;
-            inputValue.value = info.name;
-            initList.value = [info];
-          }
-        } else {
-          let idList = modelValue.value.split("|").filter((item) => item.trim() !== "");
-          if (idList.length > 0) {
-            let res = await http.post(`/uims-api/admin/uims-role/selectInfoList`, idList);
-            const infoList = res.data.data;
-            let names = "";
-            for (let index in infoList) {
-              names += infoList[index].name + "、";
-            }
-            inputValue.value = names.substring(0, names.length - 1);
-            initList.value = infoList;
-          }
-        }
-      }
-      isInitSuccess.value = true;
-    };
-    const showDialog = async () => {
-      await init();
-      isShowDialog.value = true;
-    };
-    const hideDialog = () => {
-      if (!isInitSuccess.value) {
-        EleMessage.warning("请等待初始化成功");
-        return;
-      }
-      isShowDialog.value = false;
-    };
-    const handleChange = (selectionList) => {
-      console.log("selectionList", selectionList);
-      modelValue.value = "";
-      inputValue.value = "";
-      if (selectionList.length > 0) {
-        if (!componentParam.value.isMultiple) {
-          modelValue.value = selectionList[0].id;
-          inputValue.value = selectionList[0].name;
-        } else {
-          let modelValueValue = "";
-          let inputValueValue = "";
-          for (let index in selectionList) {
-            modelValueValue += selectionList[index].id + "|";
-            inputValueValue += selectionList[index].name + "、";
-          }
-          modelValue.value = "|" + modelValueValue;
-          inputValue.value = inputValueValue.substring(0, inputValueValue.length - 1);
-        }
-      }
-      emit("change", selectionList);
-      hideDialog();
-    };
-    watch(
-      () => componentParam.value.modelValue,
-      () => {
-        init();
+    const { inputValue, isShowDialog, componentParam, showDialog, handleChange } = useFrameworkBaseDialog(props, emit, {
+      defaultParam: {
+        // 是否禁止选择已存在用户的角色
+        isDisableSelectRoleOfExistsUser: true
+      },
+      selectInfo: async (id) => {
+        const res = await http.get(`/uims-api/admin/uims-role/selectInfo`, { params: { id } });
+        return res.data.data;
       },
-      { immediate: true, immediate: true }
-    );
+      selectInfoList: async (idList) => {
+        const res = await http.post(`/uims-api/admin/uims-role/selectInfoList`, idList);
+        return res.data.data;
+      }
+    });
     __expose({
       showDialog
     });
     return (_ctx, _cache) => {
       const _component_el_input = resolveComponent("el-input");
       return openBlock(), createElementBlock(Fragment, null, [
-        componentParam.value.isShowInput ? (openBlock(), createBlock(_component_el_input, {
+        unref(componentParam).isShowInput ? (openBlock(), createBlock(_component_el_input, {
           key: 0,
-          modelValue: inputValue.value,
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => inputValue.value = $event),
+          modelValue: unref(inputValue),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(inputValue) ? inputValue.value = $event : null),
           "suffix-icon": unref(Select),
-          disabled: componentParam.value.isDisabled,
-          readonly: componentParam.value.isReadonly,
-          onClick: showDialog
-        }, null, 8, ["modelValue", "suffix-icon", "disabled", "readonly"])) : createCommentVNode("", true),
-        isShowDialog.value ? (openBlock(), createBlock(RoleDialog, {
+          disabled: unref(componentParam).isDisabled,
+          readonly: unref(componentParam).isReadonly,
+          onClick: unref(showDialog)
+        }, null, 8, ["modelValue", "suffix-icon", "disabled", "readonly", "onClick"])) : createCommentVNode("", true),
+        unref(isShowDialog) ? (openBlock(), createBlock(RoleDialog, {
           key: 1,
-          modelValue: isShowDialog.value,
-          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isShowDialog.value = $event),
-          param: componentParam.value,
-          onChange: handleChange
-        }, null, 8, ["modelValue", "param"])) : createCommentVNode("", true)
+          modelValue: unref(isShowDialog),
+          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(isShowDialog) ? isShowDialog.value = $event : null),
+          param: unref(componentParam),
+          onChange: unref(handleChange)
+        }, null, 8, ["modelValue", "param", "onChange"])) : createCommentVNode("", true)
       ], 64);
     };
   }

package/es/yu-uims-user-dialog/index.d.ts

@@ -1,33 +1,42 @@
 import { UimsUser } from 'yuang-framework-ui-common/lib/interface/uims/uimsUser';
 
-declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<string>;
-    param: {
-        type: import('vue').PropType<{
-            isMultiple?: boolean;
-            isShowInput?: boolean;
-        }>;
-        default: any;
-    };
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
+    modelValue: String;
+    param?: object;
 }>, {
-    showDialog: () => Promise<void>;
+    modelValue: any;
+    param: any;
+}>>, {
+    showDialog: () => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     change: (uimsUserList: UimsUser[]) => void;
-}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<string>;
-    param: {
-        type: import('vue').PropType<{
-            isMultiple?: boolean;
-            isShowInput?: boolean;
-        }>;
-        default: any;
-    };
-}>> & Readonly<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
+    modelValue: String;
+    param?: object;
+}>, {
+    modelValue: any;
+    param: any;
+}>>> & Readonly<{
     onChange?: ((uimsUserList: UimsUser[]) => any) | undefined;
 }>, {
-    param: {
-        isMultiple?: boolean;
-        isShowInput?: boolean;
-    };
+    modelValue: String;
+    param: object;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToRuntimeProps<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+type __VLS_Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};