@utogether/udp-core 1.0.1 → 1.0.2

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

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 11:22:51
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-29 17:11:13
+ * @LastEditTime: 2025-08-16 18:01:55
  * @Description: 托盘管理
 -->
 
@@ -13,10 +13,11 @@
       v-if="showModalForm"
       :record="record"
       :items="items"
-      :width="360"
-      :height="340"
+      :width="420"
+      :height="450"
       :title="$t('message.title.appAdd')"
       :url="url"
+      class="ut-app-form"
       data-status="add"
       @close="showModalForm = false"
       @confirm="onConfirm"
@@ -31,6 +32,7 @@ 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';
@@ -56,15 +58,20 @@ const record = ref({});
 // 列字段
 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: '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'))
+    formatter: ({ row }) => (row.enabled === '1' ? t('message.udp.appupper') : t('message.udp.applower'))
   },
   { field: 'creationDate', width: 140 },
   {
@@ -77,9 +84,7 @@ const columns = [
         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 [<ut-button content={content} icon={icon} status={status} onTap={() => handleChild(row)} />];
         }
         return [
           <>
@@ -139,13 +144,30 @@ const onButtonClick = code => {
 };
 
 const items = [
-  { field: 'appVersion', required: true },
-  { field: 'buildNo', required: true },
-  { field: 'versionInfo', required: true, itemRender: renderHook.renderTextarea() },
+  { 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,
-    itemRender: { name: '#upload', props: { baseUrl: baseURL } }
+    title: 'message.udp.downloadUrl',
+    itemRender: renderHook.renderUpload()
   }
 ];
 
@@ -155,7 +177,10 @@ const showModalForm = ref(false);
  * @description: 添加
  */
 const handleAdd = () => {
-  record.value = {};
+  record.value = {
+    // downloadUrl: 'https://vxeui.com/resource/img/fj577.jpg'
+    // downloadUrl: '/resource/image/20250817/15806d21e3f445dcae0e2e0825c76a79.jpg'
+  };
   showModalForm.value = true;
 };
 
@@ -174,3 +199,10 @@ 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/coderule/code-rule.vue

@@ -1,121 +1,132 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-12-15 17:45:07
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:29:48
- * @Description: 编码规则
--->
-<template>
-  <div>
-    <ut-grid ref="xgrid" :items="formItems" :columns="columns" :url="url" />
-
-    <ut-modal-grid
-      v-if="showModal"
-      ref="xmgrid"
-      :default-value="subParam"
-      :default-params="subParam"
-      :columns="subColumns"
-      :url="url + 'Detail'"
-      :editable="!haveBeenUsed"
-      :show-footer="false"
-      width="80%"
-      title="编码段设置"
-      @close="showModal = false"
-    />
-  </div>
-</template>
-
-<script lang="tsx">
-export default { name: 'CodeRule' };
-</script>
-<script setup lang="tsx">
-import { ref } from 'vue';
-import to from 'await-to-js';
-import { useRender } from '@utogether/utils';
-import { getServiceApi } from '../../../api';
-
-const renderHook = useRender();
-
-const xgrid = ref(null);
-const showModal = ref(false);
-const haveBeenUsed = ref(false);
-const subParam = ref({});
-
-const url = '/upfm/v1/codingRule';
-
-const formItems = [
-  { field: 'ruleCode', title: 'message.udp.ruleCode' },
-  { field: 'ruleName', title: 'message.udp.ruleName' }
-];
-// 列字段
-const columns = [
-  { type: 'checkbox', width: 40, align: 'center' },
-  {
-    field: 'ruleCode',
-    title: 'message.udp.ruleCode',
-    required: true,
-    editRender: renderHook.renderInput()
-  },
-  {
-    field: 'ruleName',
-    title: 'message.udp.ruleName',
-    required: true,
-    editRender: renderHook.renderInput()
-  },
-  { field: 'remark', editRender: renderHook.renderInput() },
-  { field: 'haveBeenUsed', title: 'message.udp.haveBeenUsed', formatter: ['formatDict', 'SU.WHETHER'] },
-  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) },
-  {
-    field: 'operate',
-    width: 80,
-    fixed: 'right',
-    slots: {
-      default: ({ row }) => {
-        const content = row.haveBeenUsed === 'Y' ? 'look' : 'encode';
-        const status = row.haveBeenUsed === 'Y' ? 'info' : 'primary';
-        return [<ut-button content={content} status={status} onTap={() => handleEdit(row)} />];
-      }
-    }
-  }
-];
-
-const subColumns = [
-  { type: 'checkbox', width: 40, align: 'center' },
-  { field: 'orderSeq', title: 'message.seqNo', required: true, editRender: renderHook.renderNumber() },
-  {
-    field: 'fieldType',
-    title: 'message.udp.xxx',
-    required: true,
-    editRender: renderHook.renderDict('SU.CODE.RULE.TYPE')
-  },
-  { field: 'fieldValue', title: 'message.udp.fieldValue', editRender: renderHook.renderInput() },
-  {
-    field: 'dateMask',
-    title: 'message.udp.dateMask',
-    editRender: renderHook.renderDict('SU.DATE.MASK')
-  },
-  {
-    field: 'resetFrequency',
-    title: 'message.udp.resetFrequency',
-    editRender: renderHook.renderDict('SU.RESET.FREQUENCY')
-  },
-  { field: 'seqLength', title: 'message.udp.seqLength', editRender: renderHook.renderInput() },
-  { field: 'startValue', title: 'message.udp.startValue', editRender: renderHook.renderInput() },
-  { field: 'currentValue', title: 'message.udp.currentValue' },
-  { field: 'remark', editRender: renderHook.renderInput() }
-  // { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) }
-];
-
-const handleEdit = row => {
-  haveBeenUsed.value = row.haveBeenUsed === 'Y';
-  subParam.value = { codingRuleId: row.id };
-  showModal.value = true;
-};
-
-// 启用/禁用
-async function handleClick({ row }) {
-  console.log(row);
-  const [err] = await to(getServiceApi().put(url, row));
-  !err && xgrid.value.refreshData();
-}
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-12-15 17:45:07
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-11-21 16:35:29
+ * @Description: 编码规则
+-->
+<template>
+  <div>
+    <ut-grid ref="xgrid" :items="formItems" :columns="columns" :url="url" :check-method="checkMethod" />
+
+    <ut-modal-grid
+      v-if="showModal"
+      ref="xmgrid"
+      :key="refreshKey"
+      :default-value="subParam"
+      :default-params="subParam"
+      :columns="subColumns"
+      :url="url + 'Detail'"
+      :editable="!haveBeenUsed"
+      :show-footer="false"
+      width="80%"
+      title="编码段设置"
+      @close="showModal = false"
+    />
+  </div>
+</template>
+
+<script lang="tsx">
+export default { name: 'CodeRule' };
+</script>
+<script setup lang="tsx">
+import { nextTick, ref } from 'vue';
+import to from 'await-to-js';
+import { useRender } from '@utogether/utils';
+import { getServiceApi } from '../../../api';
+
+const renderHook = useRender();
+
+const xgrid = ref(null);
+const xmgrid = ref(null);
+const showModal = ref(false);
+const haveBeenUsed = ref(false);
+const subParam = ref({});
+const refreshKey = ref(0);
+
+const url = '/upfm/v1/codingRule';
+
+const formItems = [
+  { field: 'ruleCode', title: 'message.udp.ruleCode' },
+  { field: 'ruleName', title: 'message.udp.ruleName' }
+];
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 40, align: 'center' },
+  {
+    field: 'ruleCode',
+    title: 'message.udp.ruleCode',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'ruleName',
+    title: 'message.udp.ruleName',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  { field: 'remark', editRender: renderHook.renderInput() },
+  { field: 'haveBeenUsed', title: 'message.udp.haveBeenUsed', formatter: ['formatDict', 'SU.WHETHER'] },
+  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) },
+  {
+    field: 'operate',
+    width: 80,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        const content = row.haveBeenUsed === 'Y' ? 'look' : 'encode';
+        const status = row.haveBeenUsed === 'Y' ? 'info' : 'primary';
+        return [<ut-button content={content} status={status} onTap={() => handleEdit(row)} />];
+      }
+    }
+  }
+];
+
+const subColumns = [
+  { type: 'checkbox', width: 40, align: 'center' },
+  { field: 'orderSeq', title: 'message.seqNo', required: true, editRender: renderHook.renderNumber() },
+  {
+    field: 'fieldType',
+    required: true,
+    editRender: renderHook.renderDict('SU.CODE.RULE.TYPE'),
+    formatter: ['formatDict', 'SU.CODE.RULE.TYPE']
+  },
+  { field: 'fieldValue', title: 'message.udp.fieldValue', editRender: renderHook.renderInput() },
+  {
+    field: 'dateMask',
+    title: 'message.udp.dateMask',
+    editRender: renderHook.renderDict('SU.DATE.MASK')
+  },
+  {
+    field: 'resetFrequency',
+    title: 'message.udp.resetFrequency',
+    editRender: renderHook.renderDict('SU.RESET.FREQUENCY')
+  },
+  { field: 'seqLength', title: 'message.udp.seqLength', editRender: renderHook.renderInput() },
+  { field: 'startValue', title: 'message.udp.startValue', editRender: renderHook.renderInput() },
+  { field: 'currentValue', title: 'message.udp.currentValue' },
+  { field: 'remark', editRender: renderHook.renderInput() }
+  // { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) }
+];
+
+const handleEdit = async row => {
+  haveBeenUsed.value = row.haveBeenUsed === 'Y';
+  subParam.value = { codingRuleId: row.id };
+  showModal.value = true;
+  await nextTick();
+  console.log(subColumns);
+  xmgrid.value.reloadGrid();
+  refreshKey.value++;
+};
+
+const checkMethod = row => {
+  return row.haveBeenUsed !== 'Y';
+};
+
+// 启用/禁用
+async function handleClick({ row }) {
+  console.log(row);
+  const [err] = await to(getServiceApi().put(url, [row]));
+  !err && xgrid.value.refreshData();
+}
+</script>

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-11-25 10:16:48
+ * @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>