@utogether/udp-core 1.0.0 → 1.0.1-beta.1

package/src/utils/udp/useRender.ts

@@ -0,0 +1,420 @@
+/*
+ * @Author: wei.li
+ * @Date: 2021-11-29 18:18:00
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-18 11:09:01
+ * @Description: file content
+ */
+
+declare interface Fn<T = any, R = T> {
+  (...arg: T[]): R;
+}
+
+interface IAttrs {
+  disabled?: boolean;
+  defaultValue?: string;
+  code?: string;
+  [x: string]: any;
+}
+
+interface IEvents {
+  change?: Fn;
+  clear?: Fn;
+  blur?: Fn;
+  focus?: Fn;
+  input?: Fn;
+  filterMethod?: Fn;
+}
+import { isObject, isEmpty, isString, isFunction } from 'xe-utils';
+import { storageLocal } from '@utogether/utils';
+
+export const useRender = () => {
+  const optionProps = { value: 'dictCode', label: 'dictName' };
+  /**
+   * @description: 字典下拉渲染
+   * @param {*} attrs string|object string时默认未code
+   * @param {*} methods fn|object 回调函数 fn默认为onChange
+   */
+  const renderDict = (attrs: IAttrs | string, methods?) => {
+    const events = getEvents(methods);
+    let props = {
+      clearable: true,
+      disabled: false,
+      showValue: false,
+      placeholder: null
+    };
+    let defaultValue;
+    let dictCode;
+    if (isObject(attrs)) {
+      props = Object.assign(props, attrs);
+      defaultValue = attrs.defaultValue;
+      dictCode = attrs?.code;
+      // keyValue = attrs?.keyValue;
+    } else {
+      dictCode = attrs;
+    }
+    const opts = storageLocal.getItem('kLov')[dictCode]?.children;
+    const options = opts ? opts.filter(opt => opt.enabled === '1') : [];
+    return {
+      name: '#select',
+      optionProps,
+      options,
+      props,
+      defaultValue,
+      events
+    };
+  };
+  /**
+   * @description: 远程搜索下拉选择-编辑
+   * @param {*} attrs attrs
+   * @return {*}
+   */
+  const renderSelect = (attrs, methods?) => {
+    const events = getEvents(methods);
+    return {
+      name: '#SuSelect',
+      optionProps: attrs?.optionProps || { label: 'label', value: 'value' },
+      props: attrs?.props,
+      options: attrs?.options || [],
+      events
+    };
+  };
+  /**
+   * @description: 查询关联了用户的员工
+   * @param {*} attr '渲染器属性'
+   * @param {*} callback 回调函数
+   * @return {*} 渲染组件
+   */
+  const renderUser = (attr?, callback?) => {
+    const attrs = {
+      optionProps: { extLabel: 'userName', value: 'employeeName' },
+      props: {
+        attrs: { disabled: attr?.disabled },
+        disabled: attr?.disabled,
+        defaultValue: attr?.defaultValue,
+        mapField: attr?.mapField,
+        code: 'SYS037',
+        url: '/uums/employee/listEmployeeIsUser',
+        fetchField: 'employeeName'
+      }
+    };
+    return renderSelect(attrs, callback);
+  };
+  /**
+   * @description: 系统用户下拉
+   * @param {*} options 映射字段
+   * @return {*}
+   */
+  const renderSysUser = (options?) => {
+    const attrs = {
+      optionProps: { extLabel: 'userName', value: 'name' },
+      props: {
+        code: 'sys/listUsers',
+        url: '/uums/user',
+        fetchField: 'name',
+        mapField: options?.mapField
+      }
+    };
+    return renderSelect(attrs);
+  };
+
+  /**
+   * @description: 查询库存组织
+   * @param {*} name '渲染器属性'
+   * @param {*} callback 回调函数
+   * @return {*} 渲染组件
+   */
+  const renderInvOrg = (attrs?, methods?) => {
+    const optionProps = {
+      label: 'organizationName',
+      value: attrs?.field || 'organizationName'
+    };
+    const props = {
+      mapField: {},
+      defaultParams: attrs?.defaultParams,
+      url: '/uums/cusOrganization',
+      fetchField: 'organizationName'
+    };
+    const mapField = {
+      organizationId: 'id',
+      organizationCode: 'organizationCode'
+    };
+    Object.assign(props.mapField, mapField, attrs?.mapField || {});
+    return { name: '#SuSelect', props, optionProps, options: [], methods };
+  };
+  /**
+   * @description: 查询业务单元
+   * @param {*} name '渲染器属性'
+   * @param {*} callback 回调函数
+   * @return {*} 渲染组件
+   */
+  const renderBU = (attrs?, methods?) => {
+    const optionProps = {
+      label: 'orgName',
+      value: attrs?.field || 'orgName'
+    };
+    const props = {
+      mapField: {},
+      defaultParams: attrs?.defaultParams,
+      url: '/uums/org',
+      fetchField: 'orgName'
+    };
+    const mapField = { orgId: 'id', orgCode: 'orgCode' };
+    Object.assign(props.mapField, mapField, attrs?.mapField || {});
+    return { name: '#SuSelect', props, optionProps, options: [], methods };
+  };
+  /**
+   * @description: item input渲染器
+   * @param {*} name 渲染器名称
+   * @param {*} props 渲染的参数（请查看目标渲染的 Props）
+   * @return {*} item 渲染器
+   */
+  const renderInput = (attrs?, methods?) => {
+    const props = Object.assign({ disabled: false }, attrs);
+    const defaultValue = props?.defaultValue;
+    return {
+      name: 'VxeInput',
+      props,
+      defaultValue,
+      events: getEvents(methods)
+    };
+  };
+  /**
+   * @description: item input渲染器
+   * @param {*} name 渲染器名称
+   * @param {*} props 渲染的参数（请查看目标渲染的 Props）
+   * @return {*} item 渲染器
+   */
+  const renderTextarea = (attrs?, methods?) => {
+    const props = Object.assign({ disabled: false, rows: 3 }, attrs);
+    const defaultValue = props?.defaultValue;
+    return {
+      name: 'VxeTextarea',
+      props,
+      defaultValue,
+      events: getEvents(methods)
+    };
+  };
+  /**
+   * @description: checkbox
+   * @param {*} attrs
+   * @return {*} checkbox渲染器
+   */
+  const renderCheckBox = (attrs, methods?) => {
+    const name = 'VxeCheckbox';
+    const { defaultValue, options, props } = commonProps(attrs);
+    return { name, defaultValue, options, props, events: getEvents(methods) };
+  };
+  /**
+   * @description: radio
+   * @param {*} attrs
+   * @param {*} methods 事件
+   * @return {*} radio渲染器
+   */
+  const renderRadio = (attrs: string | IAttrs, methods?) => {
+    const name = 'VxeRadio';
+    const { defaultValue, options, props } = commonProps(attrs);
+    return { name, defaultValue, options, props, events: getEvents(methods) };
+  };
+  const commonProps = (attrs: string | IAttrs) => {
+    let props = { disabled: false };
+    let defaultValue;
+    const dictData = storageLocal.getItem('kLov');
+    let code = '';
+    if (isObject(attrs)) {
+      defaultValue = attrs.defaultValue;
+      code = attrs.code!;
+      props = Object.assign(props, attrs || {});
+    } else if (isString(attrs)) {
+      code = attrs;
+    }
+    const options = code
+      ? dictData[code]?.children.map(m => {
+          return { label: m.dictName, value: m.dictCode };
+        })
+      : [];
+    return { props, defaultValue, options };
+  };
+  /**
+   * @description: 数值录入
+   * @param {*} attrs 渲染的参数（请查看目标渲染的props)
+   * @param {*} methods 渲染目标的events,
+   * @return {*} editRender
+   */
+  const renderNumber = (attrs?, methods?) => {
+    const events = getEvents(methods);
+    const props = Object.assign(
+      { type: 'number', clearable: true, min: 0, controls: false },
+      attrs || {}
+    );
+
+    return {
+      name: 'VxeInput',
+      props,
+      defaultValue: attrs?.defaultValue,
+      events
+    };
+  };
+  /**
+   * @description: 时间日期
+   * @param {*} attrs 渲染的参数（请查看目标渲染的props)
+   * @param {*} methods 渲染目标的events,
+   * @return {*} editRender
+   */
+  const renderDate = (attrs?, methods?) => {
+    const events = getEvents(methods);
+    const valueFormat = 'yyyy-MM-dd HH:mm:ss';
+    const defaultValue = attrs?.defaultValue;
+    const prop = { type: 'date', valueFormat, clearable: true };
+    const props = Object.assign(prop, attrs || {});
+    return { name: 'VxeInput', props, defaultValue, events };
+  };
+  /**
+   * @description: 值集视图
+   * @param {*} attrs 渲染的参数
+   * @param {*} methods 渲染目标的events,
+   * @return {*} editRender
+   */
+  const renderLov = (attrs, methods?) => {
+    const events = getEvents(methods);
+    const props = Object.assign({}, attrs || {});
+    return { name: '#lov', props, events };
+  };
+  /**
+   * @description: 本地下拉选择
+   * @param {*} attrs 同ElSelect
+   * @param {*} methods 事件, 默认为change事件
+   * @return {*}
+   */
+  const renderSelectLocal = (attrs, methods?) => {
+    const events = getEvents(methods);
+    const optionProps = attrs?.optionProps || {
+      label: 'label',
+      value: 'value'
+    };
+    const props = Object.assign({ clearable: true, disabled: false, showValue: false }, attrs || {});
+    console.log('itemRender');
+    return {
+      name: '#select',
+      optionProps,
+      options: attrs?.options || [],
+      props,
+      events
+    };
+  };
+  /**
+   * @description: 渲染成switch
+   * @param {*} attrs 请查看目标渲染的props
+   * @param {*} methods 请查看目标渲染的event
+   * @return {*} switchRender
+   */
+  const renderSwitch = (attrs?: string | IAttrs, methods?) => {
+    let props = {
+      openLabel: '是',
+      closeLabel: '否',
+      openValue: 'Y',
+      closeValue: 'N'
+    };
+    let defaultValue = 'Y';
+    if (isObject(attrs) && !isFunction(attrs)) {
+      props = Object.assign(props, attrs || {});
+      defaultValue = attrs.defaultValue || defaultValue;
+    } else if (!isEmpty(attrs) && isString(attrs)) {
+      defaultValue = attrs;
+      props = Object.assign(props, { defaultValue });
+    }
+    // @ts-ignore
+    const events = isFunction(attrs) ? getEvents(attrs) : getEvents(methods);
+    return { name: 'VxeSwitch', props, defaultValue, events };
+  };
+  /**
+   * @description: 表格渲染el-tag组件
+   * @param {*} code 数据字典code
+   * @param {*} tagMap 渲染tag对应的type {1: 'success'}
+   * @return {*} table cellRender
+   */
+  const renderCellTag = (code, tagMap) => {
+    return { name: '#tag', props: { code, tagMap } };
+  };
+  /**
+   * @description: cell渲染成el-switch
+   * @param {*} attrs 请查看目标渲染的props
+   * @param {*} methods 请查看目标渲染的event
+   * @return {*} cellRender
+   */
+  const renderEnabled = (options?, methods?) => {
+    const props: IAttrs = {
+      openLabel: '启用',
+      closeLabel: '禁用',
+      openValue: '1',
+      closeValue: '0',
+      defaultValue: '1'
+    };
+    if (!isFunction(options) && isObject(options)) {
+      Object.assign(props, options);
+    }
+    const fun = isFunction(options) ? options : methods;
+    return renderSwitch(props, fun);
+    // return { name: "#switch", props, events };
+  };
+  /**
+   * icon选择器
+   * @returns render 函数
+   */
+  const renderIconSelect = () => {
+    return { name: '#iconSelect' };
+  };
+  /**
+   * 树形选择器
+   * @param sourceData  展示数据
+   * @param props  请查看element plus的TreeSelect渲染的props
+   * @param events  事件
+   * @returns render 函数
+   */
+  const renderTreeSelect = (sourceData: IRecord[] = [], props = {}, events?) => {
+    return { name: '#treeSelect', sourceData, props, events };
+  };
+
+  const getEvents = (methods: IEvents | Fn) => {
+    let events: any = {};
+    if (isObject(methods) && !isFunction(methods)) {
+      events = {
+        change: methods?.change || cb,
+        blur: methods?.blur || cb,
+        focus: methods?.focus || cb,
+        input: methods?.input || cb,
+        clear: methods?.clear || cb,
+        filterMethod: methods?.filterMethod
+      };
+    } else if (methods) {
+      events = { change: methods };
+    }
+    return events;
+  };
+
+  function cb() {}
+  // 回调函数
+  // const callback = (e) => cb && cb(e);
+
+  return {
+    renderDict,
+    renderSelect,
+    renderInput,
+    renderTextarea,
+    renderCheckBox,
+    renderRadio,
+    renderUser,
+    renderSysUser,
+    renderInvOrg,
+    renderBU,
+    renderNumber,
+    renderLov,
+    renderSelectLocal,
+    renderDate,
+    renderSwitch,
+    renderCellTag,
+    renderEnabled,
+    renderIconSelect,
+    renderTreeSelect
+  };
+};

package/src/views/organization/inv-org/InvOrganization.vue

@@ -21,7 +21,8 @@ export default { name: 'InvOrganization' };
 <script setup lang="tsx">
 import { ref, reactive } from 'vue';
 import to from 'await-to-js';
-import { useRender } from '@utogether/utils';
+// import { useRender } from '@utogether/utils';
+import { useRender } from '../../../utils/udp/useRender';
 import { getServiceApi } from '../../../api';
 
 const url = '/uums/cusOrganization';

package/src/views/organization/staff/StaffInfo.vue

@@ -131,33 +131,3 @@ onMounted(() => {
   data.value = props.record;
 });
 </script>
-
-<style lang="scss">
-.u-menu-prefix.vxe-input {
-  height: 34px;
-}
-
-.u-menu-prefix.vxe-input .vxe-input--prefix {
-  top: 1px;
-  width: 150px;
-  height: 32px;
-  text-align: center;
-  background-color: #f5f7fa;
-  border-right: 1px solid #dcdfe6;
-}
-
-.u-menu-prefix.vxe-input .vxe-input--inner {
-  padding-left: 160px;
-  border: 1px solid #dcdfe6;
-}
-
-.my-dropdown2 {
-  background-color: #fff;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-}
-
-.list-item2:hover {
-  background-color: #f5f7fa;
-}
-</style>

package/src/views/organization/staff/StaffPanel.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:42:14
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-29 10:39:16
+ * @LastEditTime: 2025-07-16 15:30:33
  * @Description: 员工管理
 -->
 
@@ -60,7 +60,7 @@ watch(
 const formItems = [{ field: 'employeeCode' }, { field: 'employeeName' }];
 // 列字段
 const columns = [
-  // { type: 'checkbox', width: 50, align: 'center' },
+  { type: 'checkbox', width: 50, align: 'center' },
   { field: 'employeeCode' },
   { field: 'employeeName', width: 150 },
   { field: 'gender', width: 100, formatter: ['formatDict', 'SU.GENDER'] },
@@ -71,7 +71,7 @@ const columns = [
     fixed: 'right',
     slots: {
       default: ({ row }) => {
-        const content = ['1', 'Y'].includes(row.enabled) ? 'disabled' : 'enabled';
+        const content = ['1', 'Y'].includes(row.enabled) ? 'disabled' : 'enable';
         const icon = ['1', 'Y'].includes(row.enabled) ? 'ri-stop-circle-fill' : 'ri-play-circle-fill';
         const status = ['1', 'Y'].includes(row.enabled) ? 'warning' : 'success';
         return [
@@ -119,6 +119,7 @@ const handleUpdate = async (record: IRecord) => {
   xgrid.value.showLoading();
   body.enabled = body.enabled === '1' ? '0' : '1';
   await getServiceApi().put(url, body);
+  xgrid.value.hiddenLoading();
   xgrid.value.refreshData();
 };
 

package/src/views/system/menu/AuthorityPanel.vue

@@ -108,10 +108,10 @@ const onInput = record => {
   record.permissionCode = `${prefixCode.value}.${record.dispalyCode}`;
 };
 
-const emit = defineEmits<{ (e: 'onClose'): void }>();
+const emit = defineEmits<{ (e: 'close'): void }>();
 // 抽屉关闭
 function handleClose() {
-  emit('onClose');
+  emit('close');
 }
 </script>
 

package/src/views/system/menu/SystemMenu.vue

@@ -20,9 +20,9 @@
       :show="data.showDrawer"
       :record="data.record"
       :data-status="data.dataStatus"
-      @onClose="onClose"
+      @close="onClose"
     />
-    <AuthorityPanel :show="data.showAuthority" :record="data.record" @onClose="onClose" />
+    <AuthorityPanel :show="data.showAuthority" :record="data.record" @close="onClose" />
   </div>
 </template>
 
@@ -63,6 +63,8 @@ const xgrid = ref(null);
 
 const url = '/uums/menu';
 
+let row;
+
 // const buttons = [{ code: 'add', status: 'u-cyan', icon: 'plus', auth: 'add' }];
 
 const columns = [
@@ -150,6 +152,9 @@ const handleAdd = (record?: IRecord) => {
   data.record.menuCategory = !record ? '0' : '';
   data.record.parentId = record?.id;
   data.record.hasChildren = record?.hasChildren;
+  data.record.children = data.record.children || [];
+  console.log(data.record);
+  row = record;
 };
 
 // 编辑
@@ -183,7 +188,8 @@ const handleAuthorityPanel = record => {
   data.record.dispalyCode = record.permissionCode;
 };
 
-const onClose = () => {
+const onClose = (type?) => {
+  type === 'submit' && xgrid.value.getInstance().reloadTreeExpand(row);
   data.record = {};
   data.showDrawer = false;
   data.showAuthority = false;

package/src/views/system/menu/menuInfo.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:44:08
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:43:16
+ * @LastEditTime: 2025-07-16 16:45:56
  * @Description: file content
 -->
 
@@ -242,7 +242,7 @@ const authority = ref(['fetch']);
 const url = '/uums/menu';
 
 const emit = defineEmits<{
-  (e: 'onClose', type): void;
+  (e: 'close', type): void;
 }>();
 
 const getPrefixCode = () => {
@@ -277,6 +277,9 @@ const onSubmit = () => {
             };
           });
           await to(serviceApi.post(url, dataList));
+          // if (!err && record.children?.length) {
+          //   // props.record.children.push(...res);
+          // }
         }
         loading.value = false;
       } else {
@@ -305,7 +308,7 @@ const getLovList = code => {
 };
 // 抽屉关闭
 function handleClose(type) {
-  emit('onClose', type);
+  emit('close', type);
 }
 </script>
 

package/src/views/system/role/AuthorityInfo.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-22 19:50:48
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:44:48
+ * @LastEditTime: 2025-07-14 14:58:13
  * @Description: file content
 -->
 
@@ -113,24 +113,6 @@ onBeforeMount(() => {
 </script>
 
 <style lang="scss">
-.u-menu-prefix.vxe-input {
-  height: 34px;
-}
-
-.u-menu-prefix.vxe-input .vxe-input--prefix {
-  top: 1px;
-  width: 150px;
-  height: 32px;
-  text-align: center;
-  background-color: #f5f7fa;
-  border-right: 1px solid #dcdfe6;
-}
-
-.u-menu-prefix.vxe-input .vxe-input--inner {
-  padding-left: 160px;
-  border: 1px solid #dcdfe6;
-}
-
 .my-dropdown2 {
   background-color: #fff;
   border: 1px solid #dcdfe6;

package/src/views/system/sysUser/SysUserPanel.vue

@@ -265,7 +265,7 @@ const getUnitList = () => {
   serviceApi
     .get('/uums/unit', { pageSize: 10 })
     .then(res => {
-      paramExt.value = { unitId: res[0].id, type: 'system', enabled: '1' };
+      paramExt.value = { unitId: res[0].id, enabled: '1' };
     })
     .catch(() => {
       errorMessage('获取租户失败,刷新后重试');

package/src/views/udev/dict/DictView.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:21
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:22:57
+ * @LastEditTime: 2025-07-16 15:26:43
  * @Description: 数据字典
 -->
 <template>
@@ -47,7 +47,7 @@ const columns = [
   },
   {
     field: 'dictName',
-    title: 'message.udp.dictCode',
+    title: 'message.udp.dictName',
     required: true,
     editRender: renderHook.renderInput()
   },

package/src/views/uhome/components/menu-favorite.vue

@@ -160,7 +160,7 @@ const loading = ref(false);
 const checkboxModel = ref<IRecord>({});
 // const cacheCheckModel = {}; // 缓存最初选中的数据
 
-const url = '/upms/v1/menuFavority';
+const url = '/upfm/v1/menuFavority';
 
 const getCacheMenuList = async () => {
   menuList.value = await dbstorage.getItem(`U-${props.userName}-ROUTES`);

package/src/views/uhome/su-welcome.vue

@@ -215,7 +215,7 @@ const getLunarDay = () => {
 
 /** 查询收藏菜单功能 */
 const getMenuList = () => {
-  const url = '/upms/v1/menuFavority';
+  const url = '/upfm/v1/menuFavority';
   loading.value = true;
   const query = { pageSize: 20, pageNum: 1, userName: cookies.get(kLOGINER) };
   getServiceApi()

package/src/views/ulogin/login.vue

@@ -94,7 +94,7 @@
             SHENZHEN U-TOGETHER CO. LTD
           </a>
         </span>
-        <span class="flex items-center text-white" style="width: 150px; font-size: 10px">技术支持</span>
+        <span class="flex items-center text-white" style="width: 75px; font-size: 10px">技术支持</span>
       </span>
     </div>
   </div>

package/types/global.d.ts

@@ -87,7 +87,6 @@ declare global {
     VITE_BASE_URL: string;
     VITE_ROUTER_HISTORY: string;
     VITE_TITLE: string;
-    VITE_COMPRESSION: ViteCompression;
   }
 
   /**