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

package/src/views/uapp/pda/pda-app.vue

@@ -1,176 +1,208 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-12-23 11:22:51
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-29 17:11:13
- * @Description: 托盘管理
--->
-
-<template>
-  <div>
-    <ut-grid ref="xgrid" :columns="columns" :url="url" mode="form" @buttonClick="onButtonClick" />
-    <ut-modal-form
-      v-if="showModalForm"
-      :record="record"
-      :items="items"
-      :width="360"
-      :height="340"
-      :title="$t('message.title.appAdd')"
-      :url="url"
-      data-status="add"
-      @close="showModalForm = false"
-      @confirm="onConfirm"
-    />
-  </div>
-</template>
-<script lang="tsx">
-export default { name: 'PdaApp' };
-</script>
-<script setup lang="tsx">
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import to from 'await-to-js';
-import { getBaseURL, getServiceApi } from '../../../api';
-import { useRender } from '@utogether/utils';
-import { clone } from 'xe-utils';
-import SuQrcode from '../../../components/SuQrcode';
-
-const baseURL = getBaseURL();
-
-const renderHook = useRender();
-
-const { t } = useI18n();
-const url = '/upms/v1/app-manage';
-const xgrid = ref(null);
-const record = ref({});
-
-// const formItems = [
-//   { field: 'organizationName', itemRender: renderHook.renderInvOrg() },
-//   { field: 'trayTypeCode', itemRender: renderHook.renderDict('SU.TRAY.TYPE') },
-//   { field: 'trayCode' },
-//   { field: 'materialCode' },
-//   { field: 'materialName' },
-//   { field: 'packCode', title: 'message.boxSignCode' }
-// ];
-
-// 列字段
-const columns = [
-  { type: 'checkbox', width: 45, align: 'center' },
-  // { field: 'trayTypeCode', width: 110, formatter: ['formatDict', 'SU.TRAY.TYPE'] },
-  { field: 'appVersion', width: 110 },
-  { field: 'buildNo', width: 130 },
-  { field: 'versionInfo', miWidth: 200 },
-  {
-    field: 'enabled',
-    title: 'message.status',
-    width: 90,
-    formatter: ({ row }) => (row.enabled === '1' ? t('message.appupper') : t('message.applower'))
-  },
-  { field: 'creationDate', width: 140 },
-  {
-    field: 'operate',
-    width: 260,
-    fixed: 'right',
-    slots: {
-      default: ({ row }) => {
-        const content = row.enabled === '1' ? 'applower' : 'appupper';
-        const status = row.enabled === '1' ? 'warning' : 'primary';
-        const icon = row.enabled === '1' ? 'ri-inbox-archive-line' : 'ri-inbox-unarchive-line';
-        if (row.enabled !== '1') {
-          return [
-            <ut-button content={content} icon={icon} status={status} onTap={() => handleChild(row)} />
-          ];
-        }
-        return [
-          <>
-            <div style="display: flex; justify-content: space-between;">
-              <ut-button content={content} icon={icon} status={status} onTap={() => handleChild(row)} />
-              <el-popover
-                placement="left"
-                v-slots={{
-                  reference: () => <el-button type="success">{t('message.btn.scan')}</el-button>
-                }}
-              >
-                <>
-                  <SuQrcode text={baseURL + '/ufil/' + row.downloadUrl} />
-                </>
-              </el-popover>
-            </div>
-          </>
-          // <el-popover
-          //   placement="left"
-          //   v-slots={{
-          //     reference: () => <el-button type="primary">外网下载</el-button>
-          //   }}
-          // >
-          //   <>
-          //     <SuQrcode text={'http://jemes.uzuo.cn/gateway/ufil/' + row.downloadUrl} />
-          //   </>
-          // </el-popover>
-        ];
-      }
-    }
-  }
-];
-
-// 启用/禁用
-// async function handleClick({ row }) {
-//   await to(getServiceApi().put(url, row));
-//   xgrid.value.refreshData();
-// }
-
-/**
- * @param {*} row 数据源
- */
-const handleChild = async row => {
-  const body = clone(row, true);
-  body.enabled = row.enabled === '1' ? '0' : '1';
-  await to(getServiceApi().put(url, body));
-  xgrid.value.refreshData();
-};
-
-/**
- * @description:监听grid事件
- * @return {*}
- */
-const onButtonClick = code => {
-  code === 'add' && handleAdd();
-  code === 'del' && handleDel();
-};
-
-const items = [
-  { field: 'appVersion', required: true },
-  { field: 'buildNo', required: true },
-  { field: 'versionInfo', required: true, itemRender: renderHook.renderTextarea() },
-  {
-    field: 'downloadUrl',
-    required: false,
-    itemRender: { name: '#upload', props: { baseUrl: baseURL } }
-  }
-];
-
-const showModalForm = ref(false);
-
-/**
- * @description: 添加
- */
-const handleAdd = () => {
-  record.value = {};
-  showModalForm.value = true;
-};
-
-const handleDel = () => {
-  xgrid.value.getInstance().commitProxy('delete');
-};
-
-// const handleDownFile = row => {
-//   clipboardRef.value = baseURL + '/ufil/' + row.downloadUrl;
-//   successMessage('复制成功,快试试右键粘贴吧');
-// };
-
-// const buttons = [{ code: 'del', status: 'danger', icon: 'ri-delete-bin-line', auth: 'del' }];
-
-const onConfirm = () => {
-  xgrid.value.refreshData();
-};
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-12-23 11:22:51
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-08-16 18:01:55
+ * @Description: 托盘管理
+-->
+
+<template>
+  <div>
+    <ut-grid ref="xgrid" :columns="columns" :url="url" mode="form" @buttonClick="onButtonClick" />
+    <ut-modal-form
+      v-if="showModalForm"
+      :record="record"
+      :items="items"
+      :width="420"
+      :height="450"
+      :title="$t('message.title.appAdd')"
+      :url="url"
+      class="ut-app-form"
+      data-status="add"
+      @close="showModalForm = false"
+      @confirm="onConfirm"
+    />
+  </div>
+</template>
+<script lang="tsx">
+export default { name: 'PdaApp' };
+</script>
+<script setup lang="tsx">
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import to from 'await-to-js';
+import { getBaseURL, getServiceApi } from '../../../api';
+// import { useRender } from '../../../utils/udp/useRender';
+import { useRender } from '@utogether/utils';
+import { clone } from 'xe-utils';
+import SuQrcode from '../../../components/SuQrcode';
+
+const baseURL = getBaseURL();
+
+const renderHook = useRender();
+
+const { t } = useI18n();
+const url = '/upms/v1/app-manage';
+const xgrid = ref(null);
+const record = ref({});
+
+// const formItems = [
+//   { field: 'organizationName', itemRender: renderHook.renderInvOrg() },
+//   { field: 'trayTypeCode', itemRender: renderHook.renderDict('SU.TRAY.TYPE') },
+//   { field: 'trayCode' },
+//   { field: 'materialCode' },
+//   { field: 'materialName' },
+//   { field: 'packCode', title: 'message.boxSignCode' }
+// ];
+
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 45, align: 'center' },
+  { field: 'appVersion', title: 'message.udp.appVersion', width: 110 },
+  { field: 'buildNo', title: 'message.udp.buildNo', width: 130 },
+  {
+    field: 'isForceUpdate',
+    title: 'message.udp.isForceUpdate',
+    width: 130,
+    formatter: ({ row }) => (row.isForceUpdate === 'Y' ? t('message.udp.forceUpdate') : t('message.udp.freeUpdate'))
+  },
+  { field: 'versionInfo', title: 'message.udp.versionInfo', miWidth: 200 },
+  {
+    field: 'enabled',
+    title: 'message.status',
+    width: 90,
+    formatter: ({ row }) => (row.enabled === '1' ? t('message.appupper') : t('message.applower'))
+  },
+  { field: 'creationDate', width: 140 },
+  {
+    field: 'operate',
+    width: 260,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        const content = row.enabled === '1' ? 'applower' : 'appupper';
+        const status = row.enabled === '1' ? 'warning' : 'primary';
+        const icon = row.enabled === '1' ? 'ri-inbox-archive-line' : 'ri-inbox-unarchive-line';
+        if (row.enabled !== '1') {
+          return [<ut-button content={content} icon={icon} status={status} onTap={() => handleChild(row)} />];
+        }
+        return [
+          <>
+            <div style="display: flex; justify-content: space-between;">
+              <ut-button content={content} icon={icon} status={status} onTap={() => handleChild(row)} />
+              <el-popover
+                placement="left"
+                v-slots={{
+                  reference: () => <el-button type="success">{t('message.btn.scan')}</el-button>
+                }}
+              >
+                <>
+                  <SuQrcode text={baseURL + '/ufil/' + row.downloadUrl} />
+                </>
+              </el-popover>
+            </div>
+          </>
+          // <el-popover
+          //   placement="left"
+          //   v-slots={{
+          //     reference: () => <el-button type="primary">外网下载</el-button>
+          //   }}
+          // >
+          //   <>
+          //     <SuQrcode text={'http://jemes.uzuo.cn/gateway/ufil/' + row.downloadUrl} />
+          //   </>
+          // </el-popover>
+        ];
+      }
+    }
+  }
+];
+
+// 启用/禁用
+// async function handleClick({ row }) {
+//   await to(getServiceApi().put(url, row));
+//   xgrid.value.refreshData();
+// }
+
+/**
+ * @param {*} row 数据源
+ */
+const handleChild = async row => {
+  const body = clone(row, true);
+  body.enabled = row.enabled === '1' ? '0' : '1';
+  await to(getServiceApi().put(url, body));
+  xgrid.value.refreshData();
+};
+
+/**
+ * @description:监听grid事件
+ * @return {*}
+ */
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
+  code === 'del' && handleDel();
+};
+
+const items = [
+  { field: 'appVersion', title: 'message.udp.appVersion', required: true },
+  { field: 'buildNo', title: 'message.udp.buildNo', required: true },
+  {
+    field: 'isForceUpdate',
+    title: 'message.udp.isForceUpdate',
+    required: true,
+    itemRender: renderHook.renderSwitch({
+      openLabel: t('message.udp.forceUpdate'),
+      closeLabel: t('message.udp.freeUpdate'),
+      openValue: 'Y',
+      closeValue: 'N'
+    })
+  },
+  {
+    field: 'versionInfo',
+    title: 'message.udp.versionInfo',
+    required: true,
+    itemRender: renderHook.renderTextarea()
+  },
+  {
+    field: 'downloadUrl',
+    required: false,
+    title: 'message.udp.downloadUrl',
+    itemRender: renderHook.renderUpload()
+  }
+];
+
+const showModalForm = ref(false);
+
+/**
+ * @description: 添加
+ */
+const handleAdd = () => {
+  record.value = {
+    // downloadUrl: 'https://vxeui.com/resource/img/fj577.jpg'
+    // downloadUrl: '/resource/image/20250817/15806d21e3f445dcae0e2e0825c76a79.jpg'
+  };
+  showModalForm.value = true;
+};
+
+const handleDel = () => {
+  xgrid.value.getInstance().commitProxy('delete');
+};
+
+// const handleDownFile = row => {
+//   clipboardRef.value = baseURL + '/ufil/' + row.downloadUrl;
+//   successMessage('复制成功,快试试右键粘贴吧');
+// };
+
+// const buttons = [{ code: 'del', status: 'danger', icon: 'ri-delete-bin-line', auth: 'del' }];
+
+const onConfirm = () => {
+  xgrid.value.refreshData();
+};
+</script>
+<style lang="scss" scoped>
+.ut-app-form {
+  ::v-deep(.vxe-switch--label) {
+    width: 100%;
+  }
+}
+</style>

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

@@ -1,106 +1,118 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-12-23 17:33:21
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-16 15:26:43
- * @Description: 数据字典
--->
-<template>
-  <div>
-    <ut-grid
-      ref="xgrid"
-      :items="formItems"
-      :columns="columns"
-      url="/upfm/v1/lov"
-      :events="onGridEvents"
-    />
-    <child-view v-if="shouDrawer" :show="shouDrawer" :record="record" @onClose="handleClose" />
-  </div>
-</template>
-
-<script lang="tsx">
-export default { name: 'DictView' };
-</script>
-<script setup lang="tsx">
-import { ref, nextTick } from 'vue';
-import childView from './childView.vue';
-import { useRender } from '@utogether/utils';
-
-const xgrid = ref(null);
-// const renderOption = useRenderOption();
-
-const formItems = [
-  { field: 'dictCode', title: 'message.udp.dictCode' },
-  { field: 'dictName', title: 'message.udp.dictName' },
-  { field: 'dictType', title: 'message.udp.dictType' }
-];
-
-const renderHook = useRender();
-// 列字段
-const columns = [
-  { type: 'checkbox', width: 40, align: 'center' },
-  {
-    field: 'dictCode',
-    title: 'message.udp.dictCode',
-    required: true,
-    editRender: renderHook.renderInput()
-  },
-  {
-    field: 'dictName',
-    title: 'message.udp.dictName',
-    required: true,
-    editRender: renderHook.renderInput()
-  },
-  {
-    field: 'dictType',
-    title: 'message.udp.dictType',
-    required: true,
-    editRender: renderHook.renderDict('SU.DICT.TYPE'),
-    formatter: ['formatDict', 'SU.DICT.TYPE']
-  },
-  { field: 'dictDesc', title: 'message.remark', editRender: renderHook.renderInput() },
-  {
-    field: 'enabled',
-    width: 90,
-    editRender: renderHook.renderDict({ code: 'SU.ENABLE', defaultValue: '1' }),
-    formatter: ['formatDict', 'SU.ENABLE']
-  },
-  {
-    field: 'operate',
-    width: 80,
-    slots: {
-      default: ({ row }) => {
-        if (!row.id) return null;
-        return [<ut-button content="lov" onClick={() => hanldeDipose(row)} />];
-      }
-    }
-  }
-];
-
-const shouDrawer = ref(false);
-const record = ref(null);
-const hanldeDipose = row => {
-  nextTick(() => {
-    shouDrawer.value = true;
-    record.value = row;
-    record.value.total = row.children?.length;
-  });
-};
-const handleClose = () => {
-  xgrid.value.refreshData();
-  shouDrawer.value = false;
-};
-
-const onGridEvents = {
-  editActived({ row }) {
-    columns[1].editRender.props.disabled = !!row.id;
-  }
-};
-
-// function onChange(e) {
-//   console.log('onChange', e);
-// }
-// function onFocus(e) {
-//   console.log('onFocus', e);
-// }
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-12-23 17:33:21
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-07-24 10:16:17
+ * @Description: 数据字典
+-->
+<template>
+  <div>
+    <ut-grid
+      ref="xgrid"
+      :items="formItems"
+      :columns="columns"
+      :check-method="checkMethod"
+      :events="onGridEvents"
+      url="/upfm/v1/lov"
+    />
+    <child-view v-if="shouDrawer" :show="shouDrawer" :record="record" @onClose="handleClose" />
+  </div>
+</template>
+
+<script lang="tsx">
+export default { name: 'DictView' };
+</script>
+<script setup lang="tsx">
+import { ref, nextTick } from 'vue';
+import childView from './childView.vue';
+import { useRender } from '@utogether/utils';
+// import { useRender } from '../../../utils/udp/useRender';
+
+const xgrid = ref(null);
+// const renderOption = useRenderOption();
+
+const formItems = [
+  { field: 'dictCode', title: 'message.udp.dictCode' },
+  { field: 'dictName', title: 'message.udp.dictName' },
+  { field: 'dictType', title: 'message.udp.dictType', code: 'SU.DICT.TYPE' }
+];
+
+const renderHook = useRender();
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 40, align: 'center' },
+
+  {
+    field: 'dictCode',
+    title: 'message.udp.dictCode',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'dictName',
+    title: 'message.udp.dictName',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  // {
+  //   field: 'userName',
+  //   width: 300,
+  //   editRender: renderHook.renderUpload()
+  // },
+  {
+    field: 'dictType',
+    title: 'message.udp.dictType',
+    required: true,
+    editRender: renderHook.renderDict('SU.DICT.TYPE'),
+    formatter: ['formatDict', 'SU.DICT.TYPE']
+  },
+  { field: 'dictDesc', title: 'message.remark', editRender: renderHook.renderInput() },
+  {
+    field: 'enabled',
+    width: 90,
+    editRender: renderHook.renderDict({ code: 'SU.ENABLE', defaultValue: '1' }),
+    formatter: ['formatDict', 'SU.ENABLE']
+  },
+  {
+    field: 'operate',
+    width: 80,
+    slots: {
+      default: ({ row }) => {
+        if (!row.id) return null;
+        return [<ut-button content="lov" onClick={() => hanldeDipose(row)} />];
+      }
+    }
+  }
+];
+
+const shouDrawer = ref(false);
+const record = ref(null);
+const hanldeDipose = row => {
+  nextTick(() => {
+    shouDrawer.value = true;
+    record.value = row;
+    record.value.total = row.children?.length;
+  });
+};
+const handleClose = () => {
+  xgrid.value.refreshData();
+  shouDrawer.value = false;
+};
+
+const onGridEvents = {
+  editActived({ row }) {
+    columns[1].editRender.props.disabled = !!row.id;
+  }
+};
+
+// function onChange(e) {
+//   console.log('onChange', e);
+// }
+// function onFocus(e) {
+//   console.log('onFocus', e);
+// }
+
+const checkMethod = row => {
+  return row.dictType !== '0';
+};
+</script>

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

@@ -46,12 +46,7 @@
             <template #default="{ row }">
               <ut-button status="primary" content="edit" @tap="onEdit(row)" />
               <ut-button status="warning" content="delete" @tap="onDel(row)" />
-              <ut-button
-                status="success"
-                content="add"
-                :disabled="row.enabled !== '1'"
-                @tap="onChildren(row)"
-              />
+              <ut-button status="success" content="add" :disabled="row.enabled !== '1'" @tap="onChildren(row)" />
             </template>
           </vxe-table-column>
         </vxe-table>
@@ -110,6 +105,7 @@ const showModal = ref(false);
 const subRecord = ref<IRecord>({});
 const temp = ref<IRecord>({});
 const modalType = ref('add');
+
 const subItems = [
   { field: 'dictCode', title: 'message.udp.dictCode', required: true },
   { field: 'dictName', title: 'message.udp.dictName', required: true },
@@ -179,7 +175,11 @@ const onConfirm = async () => {
   loading.value = false;
   if (!err) {
     console.log({ res });
-    showModal.value = false;
+    if (modalType.value === 'edit') {
+      showModal.value = false;
+    } else {
+      subRecord.value = { enabled: '1' };
+    }
     successMessage();
     getDict();
   }