@utogether/udp-core 1.0.1-beta.2 → 1.0.1-beta.21

package/src/views/udev/coderule/code-rule.vue

@@ -1,121 +1,120 @@
-<!--
- * @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-10-30 13:18:33
+ * @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',
+    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>

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-07-16 15:26:43
+ * @LastEditTime: 2025-09-12 13:28:27
  * @Description: 数据字典
 -->
 <template>
@@ -11,8 +11,9 @@
       ref="xgrid"
       :items="formItems"
       :columns="columns"
-      url="/upfm/v1/lov"
+      :check-method="checkMethod"
       :events="onGridEvents"
+      url="/upfm/v1/lov"
     />
     <child-view v-if="shouDrawer" :show="shouDrawer" :record="record" @onClose="handleClose" />
   </div>
@@ -25,6 +26,7 @@ export default { name: 'DictView' };
 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();
@@ -32,13 +34,14 @@ const xgrid = ref(null);
 const formItems = [
   { field: 'dictCode', title: 'message.udp.dictCode' },
   { field: 'dictName', title: 'message.udp.dictName' },
-  { field: 'dictType', title: 'message.udp.dictType' }
+  { 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',
@@ -51,6 +54,11 @@ const columns = [
     required: true,
     editRender: renderHook.renderInput()
   },
+  // {
+  //   field: 'userName',
+  //   width: 300,
+  //   editRender: renderHook.renderUpload()
+  // },
   {
     field: 'dictType',
     title: 'message.udp.dictType',
@@ -93,7 +101,7 @@ const handleClose = () => {
 
 const onGridEvents = {
   editActived({ row }) {
-    columns[1].editRender.props.disabled = !!row.id;
+    // columns[1].editRender.props.disabled = !!row.id;
   }
 };
 
@@ -103,4 +111,8 @@ const onGridEvents = {
 // 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 },
@@ -145,7 +141,7 @@ const onChildren = row => {
   temp.value = JSON.parse(JSON.stringify(row));
 };
 const onDel = async row => {
-  const type = await VxeUI.modal.confirm(t('message.deleteRecord'));
+  const type = await VxeUI.modal.confirm(t('message.delRecord'));
   if (type === 'confirm') {
     await getServiceApi().delete(URL, [row]);
     successMessage();
@@ -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();
   }

package/src/views/ufile/aggregation/File.vue

@@ -24,17 +24,17 @@ const xgrid = ref(null);
 const url = '/ufil/v1/attachment';
 
 const formItems = [
-  { field: 'fileName', title: 'message.file.fileName' },
+  { field: 'fileName', title: 'message.urpt.fileName' },
   { field: 'creationDate', itemRender: { name: '#SuDateRange', props: { type: 'daterange' } } },
   { field: 'createdByName' }
 ];
 
 // 列字段
 const columns = [
-  { field: 'fileName', title: 'message.file.fileName', width: 240 },
-  { field: 'fileSize', title: 'message.file.fileSize', width: 110 },
-  { field: 'fileExtend', title: 'message.file.fileExtend', width: 100 },
-  { field: 'realpath', title: 'message.file.filePath' },
+  { field: 'fileName', title: 'message.urpt.fileName', width: 240 },
+  { field: 'fileSize', title: 'message.urpt.fileSize', width: 110 },
+  { field: 'fileExtend', title: 'message.urpt.fileExtend', width: 100 },
+  { field: 'realpath', title: 'message.urpt.filePath' },
   { field: 'createdByName', width: 120 },
   { field: 'creationDate', width: 160 },
   {

package/src/views/ufile/file/water-mark.vue

@@ -25,15 +25,15 @@ const renderHook = useRender();
 const url = '/ufil/v1/watermark';
 
 const formItems = [
-  { field: 'watermarkCode', title: 'message.file.watermarkContent' },
+  { field: 'watermarkCode', title: 'message.urpt.watermarkContent' },
   {
     field: 'watermarkType',
-    title: 'message.file.watermarkType',
+    title: 'message.urpt.watermarkType',
     itemRender: renderHook.renderDict('SU.WATERMARK.TYPE')
   },
   {
     field: 'textAlign',
-    title: 'message.file.textAlign',
+    title: 'message.urpt.textAlign',
     itemRender: renderHook.renderDict('SU.ALIGN.TYPE')
   }
 ];
@@ -43,14 +43,14 @@ const columns = [
   { type: 'checkbox', width: 40, align: 'center' },
   {
     field: 'watermarkCode',
-    title: 'message.file.watermarkContent',
+    title: 'message.urpt.watermarkContent',
     required: true,
     minWidth: 110,
     editRender: renderHook.renderInput()
   },
   {
     field: 'watermarkType',
-    title: 'message.file.watermarkType',
+    title: 'message.urpt.watermarkType',
     width: 120,
     required: true,
     editRender: renderHook.renderDict({ code: 'SU.WATERMARK.TYPE', defaultValue: 'text' }),
@@ -58,13 +58,13 @@ const columns = [
   },
   {
     field: 'content',
-    title: 'message.file.watermarkContent',
+    title: 'message.urpt.watermarkContent',
     width: 110,
     editRender: renderHook.renderInput()
   },
   {
     field: 'textAlign',
-    title: 'message.file.textAlign',
+    title: 'message.urpt.textAlign',
     width: 120,
     required: true,
     editRender: renderHook.renderDict('SU.ALIGN.TYPE'),
@@ -72,32 +72,32 @@ const columns = [
   },
   {
     field: 'watermarkTrigger',
-    title: 'message.file.watermarkTrigger',
+    title: 'message.urpt.watermarkTrigger',
     width: 120,
     required: true,
     editRender: renderHook.renderDict('SU.WATERMARK.TRIGGER'),
     formatter: ['formatDict', 'SU.WATERMARK.TRIGGER']
   },
-  { field: 'color', title: 'message.file.color', width: 90, editRender: renderHook.renderInput() },
+  { field: 'color', title: 'message.urpt.color', width: 90, editRender: renderHook.renderInput() },
   {
     field: 'fillOpacity',
-    title: 'message.file.fillOpacity',
+    title: 'message.urpt.fillOpacity',
     width: 100,
     editRender: renderHook.renderNumber()
   },
   {
     field: 'fontSize',
-    title: 'message.file.fontSize',
+    title: 'message.urpt.fontSize',
     width: 110,
     editRender: renderHook.renderNumber()
   },
   {
     field: 'rotation',
-    title: 'message.file.rotation',
+    title: 'message.urpt.rotation',
     width: 110,
     editRender: renderHook.renderNumber()
   },
-  { field: 'xAxis', title: 'message.file.xAxis', width: 100, editRender: renderHook.renderNumber() },
-  { field: 'yAxis', title: 'message.file.yAxis', width: 100, editRender: renderHook.renderNumber() }
+  { field: 'xAxis', title: 'message.urpt.xAxis', width: 100, editRender: renderHook.renderNumber() },
+  { field: 'yAxis', title: 'message.urpt.yAxis', width: 100, editRender: renderHook.renderNumber() }
 ];
 </script>