yuang-framework-ui-pc 1.1.71 → 1.1.73

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

@@ -19,6 +19,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const modelValue = useModel(__props, "modelValue");
     const initList = ref([]);
+    const initSelectionList = ref([]);
     const inputValue = ref("");
     const isShowDialog = ref(false);
     const isInitSuccess = ref(false);
@@ -29,9 +30,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       // 是否禁止选择已存在的角色
       isDisableSelectExistsRole: true,
       ...props.param,
-      initList: initList.value
+      initList: initList.value,
+      initSelectionList: initSelectionList.value
     }));
     const init = async () => {
+      initList.value = [];
       if (modelValue.value) {
         if (!componentParam.value.isMultiple) {
           if (modelValue.value != "0") {
@@ -56,7 +59,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       isInitSuccess.value = true;
     };
-    const showDialog = () => {
+    const showDialog = async () => {
+      await init();
       isShowDialog.value = true;
     };
     const hideDialog = () => {
@@ -66,26 +70,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       isShowDialog.value = false;
     };
-    const handleChange = (selections) => {
-      console.log("selections", selections);
+    const handleChange = (selectionList) => {
+      console.log("selectionList", selectionList);
       modelValue.value = "";
       inputValue.value = "";
-      if (selections.length > 0) {
+      if (selectionList.length > 0) {
         if (!componentParam.value.isMultiple) {
-          modelValue.value = selections[0].id;
-          inputValue.value = selections[0].name;
+          modelValue.value = selectionList[0].id;
+          inputValue.value = selectionList[0].name;
         } else {
           let modelValueValue = "";
           let inputValueValue = "";
-          for (let index in selections) {
-            modelValueValue += selections[index].id + "|";
-            inputValueValue += selections[index].name + "、";
+          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", selections);
+      emit("change", selectionList);
       hideDialog();
     };
     watch(

package/lib/yu-uims-role-dialog/components/role-dialog.cjs

@@ -6,6 +6,7 @@ const core = require("../../utils/core");
 const httpConfig = require("yuang-framework-ui-common/lib/config/httpConfig");
 const applicationConfig = require("yuang-framework-ui-common/lib/config/applicationConfig");
 const icons = require("../../icons");
+const objectUtils = require("yuang-framework-ui-common/lib/utils/objectUtils");
 const _hoisted_1 = { style: { "padding": "0 16px 12px 0" } };
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "UimsRoleV2" },
@@ -29,6 +30,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const isShowTree = vue.ref(true);
     const selectedApplication = vue.ref(null);
     const applicationName = vue.ref("");
+    const selectionList = vue.ref([]);
+    vue.onMounted(() => {
+      selectionList.value = objectUtils.deepClone(props.param.initList ?? []);
+    });
     const queryPage = async () => {
       let data = { parentIdForEqual: "0", nameForLike: applicationName.value };
       isLoading.value = true;
@@ -78,9 +83,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const handleSure = () => {
       handleCancel();
-      emit("change", roleListRef.value.selections);
+      emit("change", selectionList.value);
     };
     queryPage();
+    vue.watch(
+      () => selectionList.value,
+      () => {
+        console.log("selectionList.value", selectionList.value);
+      },
+      { deep: true }
+    );
     return (_ctx, _cache) => {
       const _component_el_input = vue.resolveComponent("el-input");
       const _component_el_icon = vue.resolveComponent("el-icon");
@@ -95,7 +107,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         form: "",
         width: "85%",
         modelValue: isOpenDialog.value,
-        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isOpenDialog.value = $event),
+        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => isOpenDialog.value = $event),
         title: "选择角色",
         class: "yu-big-dialog"
       }, {
@@ -104,11 +116,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             icon: vue.unref(iconsVue.Close),
             onClick: handleCancel
           }, {
-            default: vue.withCtx(() => _cache[2] || (_cache[2] = [
+            default: vue.withCtx(() => _cache[3] || (_cache[3] = [
               vue.createTextVNode("取消")
             ])),
             _: 1,
-            __: [2]
+            __: [3]
           }, 8, ["icon"]),
           vue.createVNode(_component_el_button, {
             type: "primary",
@@ -116,11 +128,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             loading: isLoading.value,
             onClick: handleSure
           }, {
-            default: vue.withCtx(() => _cache[3] || (_cache[3] = [
+            default: vue.withCtx(() => _cache[4] || (_cache[4] = [
               vue.createTextVNode(" 确认 ")
             ])),
             _: 1,
-            __: [3]
+            __: [4]
           }, 8, ["icon", "loading"])
         ]),
         default: vue.withCtx(() => [
@@ -151,9 +163,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                         key: 0,
                         ref_key: "roleListRef",
                         ref: roleListRef,
-                        application: selectedApplication.value,
-                        param: props.param
-                      }, null, 8, ["application", "param"])) : vue.createCommentVNode("", true)
+                        uimsApplication: selectedApplication.value,
+                        param: props.param,
+                        selectionList: selectionList.value,
+                        "onUpdate:selectionList": _cache[1] || (_cache[1] = ($event) => selectionList.value = $event)
+                      }, null, 8, ["uimsApplication", "param", "selectionList"])) : vue.createCommentVNode("", true)
                     ]),
                     default: vue.withCtx(() => [
                       vue.createElementVNode("div", _hoisted_1, [

package/lib/yu-uims-role-dialog/components/role-list.cjs

@@ -3,15 +3,19 @@ const vue = require("vue");
 const RoleQuery = require("./role-query");
 const httpConfig = require("yuang-framework-ui-common/lib/config/httpConfig");
 const applicationConfig = require("yuang-framework-ui-common/lib/config/applicationConfig");
+const objectUtils = require("yuang-framework-ui-common/lib/utils/objectUtils");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "UimsUserList" },
   __name: "role-list",
   props: {
     param: {},
-    application: {}
+    uimsApplication: {},
+    selectionList: {}
   },
-  setup(__props, { expose: __expose }) {
+  emits: ["update:selectionList"],
+  setup(__props, { emit: __emit }) {
     const props = __props;
+    const emit = __emit;
     const queryRef = vue.ref(null);
     const tableRef = vue.ref(null);
     const columns = vue.ref([
@@ -108,17 +112,29 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     ]);
     const selections = vue.ref([]);
+    const tableList = vue.ref([]);
+    vue.onMounted(() => {
+      initSelectionList();
+    });
+    const initSelectionList = () => {
+      selections.value = objectUtils.deepClone(props.selectionList ?? []);
+      console.log("props.param", props.param);
+      console.log("selections.value", selections.value);
+    };
     const datasource = async ({ queryParam, pageParam, orderParamList }) => {
       var _a, _b;
       const data = {
         ...queryParam,
         ...pageParam,
         orderParamList,
-        uimsApplicationIdForEqual: props.application.id,
+        uimsApplicationIdForEqual: props.uimsApplication.id,
         // 查询角色存在的用户id
-        selectRoleExistsUserIdForEqual: ((_a = props.param) == null ? void 0 : _a.isDisableSelectExistsUser) && ((_b = props.param) == null ? void 0 : _b.selectRoleExistsUserId)
+        selectRoleExistsUserIdForEqual: ((_a = props.param) == null ? void 0 : _a.isDisableSelectExistsUser) && ((_b = props.param) == null ? void 0 : _b.selectRoleExistsUserId),
+        // 是否排除所有人角色
+        isExcludeEveryOne: true
       };
       const res = await httpConfig.http.post(`${applicationConfig.application.gatewayServerBaseUrl}/uims-api/admin/uims-role/selectPage`, data);
+      tableList.value = res.data.data.records;
       return res.data.data;
     };
     const queryPage = () => {
@@ -127,14 +143,32 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       (_c = (_a = tableRef.value) == null ? void 0 : _a.reload) == null ? void 0 : _c.call(_a, { currentPage: 1, queryParam: (_b = queryRef.value) == null ? void 0 : _b.queryForm });
     };
     vue.watch(
-      () => props.application.id,
+      () => props.uimsApplication.id,
       () => {
         var _a, _b;
         (_b = (_a = queryRef.value) == null ? void 0 : _a.resetFields) == null ? void 0 : _b.call(_a);
         queryPage();
+        initSelectionList();
+      }
+    );
+    vue.watch(
+      () => selections.value,
+      (newSelections) => {
+        let tempSelections = objectUtils.deepClone(newSelections ?? []);
+        let updateSelectionList = objectUtils.deepClone(props.selectionList ?? []);
+        tempSelections.forEach((item) => {
+          const isRepeat = updateSelectionList.some((old) => old.id === item.id);
+          if (!isRepeat) {
+            updateSelectionList.push(item);
+          }
+        });
+        updateSelectionList = updateSelectionList.filter((item) => {
+          return tempSelections.some((newItem) => newItem.id === item.id) || !tableList.value.some((t) => t.id === item.id);
+        });
+        console.log("updateSelectionList", updateSelectionList);
+        emit("update:selectionList", updateSelectionList);
       }
     );
-    __expose({ selections });
     return (_ctx, _cache) => {
       const _component_el_tag = vue.resolveComponent("el-tag");
       const _component_ele_pro_table = vue.resolveComponent("ele-pro-table");

package/lib/yu-uims-role-dialog/components/role-list.d.ts

@@ -4,44 +4,18 @@ import { UimsRole } from 'yuang-framework-ui-common/lib/interface/uims/uimsRole'
 declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     param: any;
     /** 应用 */
-    application: UimsApplication;
-}>>, {
-    selections: import('vue').Ref<{
-        code?: string | undefined;
-        name?: string | undefined;
-        status?: number | undefined;
-        id?: string | undefined;
-        parentId?: string | undefined;
-        uimsApplicationId?: string | undefined;
-        sequence?: number | undefined;
-        remark?: string | undefined;
-        createUserAccount?: string | undefined;
-        createUserName?: string | undefined;
-        createTime?: string | undefined;
-        lastUpdateUserAccount?: string | undefined;
-        lastUpdateUserName?: string | undefined;
-        lastUpdateTime?: Date | undefined;
-    }[], UimsRole[] | {
-        code?: string | undefined;
-        name?: string | undefined;
-        status?: number | undefined;
-        id?: string | undefined;
-        parentId?: string | undefined;
-        uimsApplicationId?: string | undefined;
-        sequence?: number | undefined;
-        remark?: string | undefined;
-        createUserAccount?: string | undefined;
-        createUserName?: string | undefined;
-        createTime?: string | undefined;
-        lastUpdateUserAccount?: string | undefined;
-        lastUpdateUserName?: string | undefined;
-        lastUpdateTime?: Date | undefined;
-    }[]>;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
+    uimsApplication: UimsApplication;
+    selectionList: UimsRole[];
+}>>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    "update:selectionList": (changeList: UimsRole[]) => void;
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     param: any;
     /** 应用 */
-    application: UimsApplication;
-}>>> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+    uimsApplication: UimsApplication;
+    selectionList: UimsRole[];
+}>>> & Readonly<{
+    "onUpdate:selectionList"?: ((changeList: UimsRole[]) => any) | undefined;
+}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToRuntimeProps<T> = {

package/lib/yu-uims-role-dialog/index.cjs

@@ -33,6 +33,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       initList: initList.value
     }));
     const init = async () => {
+      initList.value = [];
       if (modelValue.value) {
         if (!componentParam.value.isMultiple) {
           if (modelValue.value != "0") {
@@ -57,7 +58,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       isInitSuccess.value = true;
     };
-    const showDialog = () => {
+    const showDialog = async () => {
+      await init();
       isShowDialog.value = true;
     };
     const hideDialog = () => {
@@ -67,26 +69,26 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       isShowDialog.value = false;
     };
-    const handleChange = (selections) => {
-      console.log("selections", selections);
+    const handleChange = (selectionList) => {
+      console.log("selectionList", selectionList);
       modelValue.value = "";
       inputValue.value = "";
-      if (selections.length > 0) {
+      if (selectionList.length > 0) {
         if (!componentParam.value.isMultiple) {
-          modelValue.value = selections[0].id;
-          inputValue.value = selections[0].name;
+          modelValue.value = selectionList[0].id;
+          inputValue.value = selectionList[0].name;
         } else {
           let modelValueValue = "";
           let inputValueValue = "";
-          for (let index in selections) {
-            modelValueValue += selections[index].id + "|";
-            inputValueValue += selections[index].name + "、";
+          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", selections);
+      emit("change", selectionList);
       hideDialog();
     };
     vue.watch(

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

@@ -10,7 +10,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: any;
     };
 }>, {
-    showDialog: () => void;
+    showDialog: () => Promise<void>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     change: (uimsRoleList: UimsRole[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{

package/lib/yu-uims-user-dialog/components/user-dialog.cjs

@@ -28,8 +28,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const userListRef = vue.ref(null);
     const isLoading = vue.ref(true);
     const isShowTree = vue.ref(true);
-    const organization = vue.ref(null);
+    const uimsOrganization = vue.ref(null);
     const orgName = vue.ref("");
+    const selectionList = vue.ref([]);
+    vue.onMounted(() => {
+      selectionList.value = objectUtils.deepClone(props.param.initList ?? []);
+    });
     const loadTreeNode = async (node, resolve) => {
       var _a, _b;
       let data = {};
@@ -47,8 +51,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         isLoading.value = false;
       }
       let listData = res.data.data.records;
-      listData.forEach((organization2) => {
-        organization2.isLeaf = !organization2.isHasChildren;
+      listData.forEach((organization) => {
+        organization.isLeaf = !organization.isHasChildren;
       });
       vue.nextTick(() => {
         if (node.level == 0) {
@@ -79,10 +83,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleNodeClick = (row) => {
       var _a, _b;
       if (row && row.id) {
-        organization.value = row;
+        uimsOrganization.value = row;
         (_b = (_a = treeRef.value) == null ? void 0 : _a.setCurrentKey) == null ? void 0 : _b.call(_a, row.id);
       } else {
-        organization.value = null;
+        uimsOrganization.value = null;
       }
     };
     let queryCondition = null;
@@ -101,8 +105,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const handleSure = () => {
       handleCancel();
-      emit("change", userListRef.value.selections);
+      emit("change", selectionList.value);
     };
+    vue.watch(
+      () => selectionList.value,
+      () => {
+        console.log("selectionList.value", selectionList.value);
+      },
+      { deep: true }
+    );
     return (_ctx, _cache) => {
       const _component_el_input = vue.resolveComponent("el-input");
       const _component_el_icon = vue.resolveComponent("el-icon");
@@ -117,7 +128,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         form: "",
         width: "85%",
         modelValue: isOpenDialog.value,
-        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isOpenDialog.value = $event),
+        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => isOpenDialog.value = $event),
         title: "选择用户",
         class: "yu-big-dialog"
       }, {
@@ -126,11 +137,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             icon: vue.unref(iconsVue.Close),
             onClick: handleCancel
           }, {
-            default: vue.withCtx(() => _cache[2] || (_cache[2] = [
+            default: vue.withCtx(() => _cache[3] || (_cache[3] = [
               vue.createTextVNode("取消")
             ])),
             _: 1,
-            __: [2]
+            __: [3]
           }, 8, ["icon"]),
           vue.createVNode(_component_el_button, {
             type: "primary",
@@ -138,11 +149,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             loading: isLoading.value,
             onClick: handleSure
           }, {
-            default: vue.withCtx(() => _cache[3] || (_cache[3] = [
+            default: vue.withCtx(() => _cache[4] || (_cache[4] = [
               vue.createTextVNode(" 确认 ")
             ])),
             _: 1,
-            __: [3]
+            __: [4]
           }, 8, ["icon", "loading"])
         ]),
         default: vue.withCtx(() => [
@@ -169,13 +180,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                     style: { height: "100%", overflow: "visible" }
                   }, {
                     body: vue.withCtx(() => [
-                      organization.value && organization.value.id ? (vue.openBlock(), vue.createBlock(UserList, {
+                      uimsOrganization.value && uimsOrganization.value.id ? (vue.openBlock(), vue.createBlock(UserList, {
                         key: 0,
                         ref_key: "userListRef",
                         ref: userListRef,
                         param: props.param,
-                        organization: organization.value
-                      }, null, 8, ["param", "organization"])) : vue.createCommentVNode("", true)
+                        uimsOrganization: uimsOrganization.value,
+                        selectionList: selectionList.value,
+                        "onUpdate:selectionList": _cache[1] || (_cache[1] = ($event) => selectionList.value = $event)
+                      }, null, 8, ["param", "uimsOrganization", "selectionList"])) : vue.createCommentVNode("", true)
                     ]),
                     default: vue.withCtx(() => [
                       vue.createElementVNode("div", _hoisted_1, [

package/lib/yu-uims-user-dialog/components/user-list.cjs

@@ -5,15 +5,19 @@ const UserQuery = require("./user-query");
 const icons = require("../../icons");
 const httpConfig = require("yuang-framework-ui-common/lib/config/httpConfig");
 const applicationConfig = require("yuang-framework-ui-common/lib/config/applicationConfig");
+const objectUtils = require("yuang-framework-ui-common/lib/utils/objectUtils");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "UimsUserList" },
   __name: "user-list",
   props: {
     param: {},
-    organization: {}
+    uimsOrganization: {},
+    selectionList: {}
   },
-  setup(__props, { expose: __expose }) {
+  emits: ["update:selectionList"],
+  setup(__props, { emit: __emit }) {
     const props = __props;
+    const emit = __emit;
     const queryRef = vue.ref(null);
     const tableRef = vue.ref(null);
     const columns = vue.ref([
@@ -24,7 +28,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         align: "center",
         fixed: "left",
         selectable: (row) => {
-          return !row.isUserExistsRole;
+          return !row.isRoleExistsUser;
         }
       },
       {
@@ -132,17 +136,27 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     ]);
     const selections = vue.ref([]);
+    const tableList = vue.ref([]);
+    vue.onMounted(() => {
+      initSelectionList();
+    });
+    const initSelectionList = () => {
+      selections.value = objectUtils.deepClone(props.selectionList ?? []);
+      console.log("props.param", props.param);
+      console.log("selections.value", selections.value);
+    };
     const datasource = async ({ queryParam, pageParam, orderParamList }) => {
       var _a, _b;
       const data = {
         ...queryParam,
         ...pageParam,
         orderParamList,
-        organizationIdForEqual: props.organization.id,
+        organizationIdForEqual: props.uimsOrganization.id,
         // 查询用户存在的角色id
         selectUserExistsRoleIdForEqual: ((_a = props.param) == null ? void 0 : _a.isDisableSelectExistsRole) && ((_b = props.param) == null ? void 0 : _b.selectUserExistsRoleId)
       };
       const res = await httpConfig.http.post(`${applicationConfig.application.gatewayServerBaseUrl}/uims-api/admin/uims-user/selectPage`, data);
+      tableList.value = res.data.data.records;
       return res.data.data;
     };
     const queryPage = () => {
@@ -151,14 +165,32 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       (_c = (_a = tableRef.value) == null ? void 0 : _a.reload) == null ? void 0 : _c.call(_a, { currentPage: 1, queryParam: (_b = queryRef.value) == null ? void 0 : _b.queryForm });
     };
     vue.watch(
-      () => props.organization.id,
+      () => props.uimsOrganization.id,
       () => {
         var _a, _b;
         (_b = (_a = queryRef.value) == null ? void 0 : _a.resetFields) == null ? void 0 : _b.call(_a);
         queryPage();
+        initSelectionList();
+      }
+    );
+    vue.watch(
+      () => selections.value,
+      (newSelections) => {
+        let tempSelections = objectUtils.deepClone(newSelections ?? []);
+        let updateSelectionList = objectUtils.deepClone(props.selectionList ?? []);
+        tempSelections.forEach((item) => {
+          const isRepeat = updateSelectionList.some((old) => old.id === item.id);
+          if (!isRepeat) {
+            updateSelectionList.push(item);
+          }
+        });
+        updateSelectionList = updateSelectionList.filter((item) => {
+          return tempSelections.some((newItem) => newItem.id === item.id) || !tableList.value.some((t) => t.id === item.id);
+        });
+        console.log("updateSelectionList", updateSelectionList);
+        emit("update:selectionList", updateSelectionList);
       }
     );
-    __expose({ selections });
     return (_ctx, _cache) => {
       const _component_el_icon = vue.resolveComponent("el-icon");
       const _component_el_tag = vue.resolveComponent("el-tag");