@utogether/udp-core 1.0.1-beta.19 → 1.0.1-beta.20

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@utogether/udp-core",
   "private": false,
-  "version": "1.0.1-beta.19",
+  "version": "1.0.1-beta.20",
   "description": "",
   "type": "module",
   "main1": "index.ts",

package/src/components/udp/form/form.vue

@@ -0,0 +1,109 @@
+<!--
+ * @Author: wei.li
+ * @Date: 2022-03-02 17:07:59
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-09-11 16:24:13
+ * @Description: SuForm
+-->
+
+<template>
+  <div class="width: 100%">
+    <vxe-form
+      ref="xForm"
+      :data="record"
+      :items="formItems"
+      :rules="rules"
+      :loading="loading"
+      :vertical="vertical"
+      :title-width="titleWidth"
+      title-overflow
+      title-align="right"
+      title-bold
+      v-bind="$attrs"
+    >
+      <template #dividerPrefix />
+      <template #collapseNode>
+        <vxe-checkbox
+          v-model="collapseStatus"
+          content="查看更多"
+          :checked-value="false"
+          :unchecked-value="true"
+          class="pl-10"
+          @change="onChange"
+        />
+      </template>
+    </vxe-form>
+  </div>
+</template>
+
+<script lang="ts">
+export default {
+  name: 'UtForm'
+};
+</script>
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n';
+import { ref, computed } from 'vue';
+import { formatRules, formatItems } from '@utogether/utils';
+import { clone } from 'xe-utils';
+
+export interface IProps {
+  record: IRecord; // 数据对象
+  items: Array<IFormItemProps>; // form item
+  loading?: boolean;
+  vertical?: boolean;
+  titleWidth?: number;
+  span?: number;
+  dataStatus?: string;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  record: (): IRecord => {
+    return {};
+  },
+  items: () => [],
+  loading: false,
+  vertical: false,
+  titleWidth: 100,
+  span: 6,
+  dataStatus: 'detail'
+});
+const xForm = ref(undefined);
+const { t } = useI18n();
+const collapseStatus = ref(true);
+/**
+ * @description: 根据items 获取必填选
+ */
+const rules = computed(() => {
+  if (!props.items.length) return {};
+  return formatRules(props.items, t);
+});
+
+const formItems = computed(() => {
+  if (!props.items.length) return props.items;
+  return formatItems(clone(props.items, true), props.dataStatus, 6);
+});
+
+const onChange = () => {
+  xForm.value.toggleCollapse();
+};
+
+/**
+ * @deprecated
+ * @description 使用validate替换
+ * @param cb
+ */
+const validateForm = (cb: Function) => {
+  (xForm as any).value.validate(cb);
+};
+const validate = (cb: Function) => {
+  (xForm as any).value.validate(cb);
+  setTimeout(() => {
+    xForm.value.clearValidate();
+  }, 1600);
+};
+defineExpose({
+  validateForm,
+  validate
+});
+</script>

package/src/components/udp/index.ts

@@ -1,3 +1,4 @@
 import UtGrid2 from './grid/index.vue';
+import UtForm2 from './form/form.vue';
 
-export { UtGrid2 };
+export { UtGrid2, UtForm2 };

package/src/components/udp/utils.ts

@@ -141,7 +141,6 @@ export const save = (http, body, props) => {
  */
 const formatMultipleParams = (listQuery: any, items) => {
   const multipleItems = items.filter(f => f.itemRender?.props?.multiple || f.multiple);
-  debugger;
   if (isEmpty(multipleItems)) return listQuery;
   const query = clone(listQuery, true);
   multipleItems.forEach((element: any) => {

package/src/layout/components/lay-sidebar/sidebar-logo.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:02:30
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-17 17:15:15
+ * @LastEditTime: 2025-11-03 15:01:34
  * @Description: file content
 -->
 <script setup lang="ts">
@@ -55,7 +55,6 @@ const logo = ref(sysConfig['logo'] || utogether);
     white-space: nowrap;
 
     .ut-sidebar-logo {
-      max-width: 67%;
       height: 100%;
     }
 
@@ -64,9 +63,11 @@ const logo = ref(sysConfig['logo'] || utogether);
     }
 
     .sidebar-title {
-      display: block;
-      // width: 140px;
+      display: flex;
+      align-items: end;
+      // he: 140px;
       // margin-top: 10px;
+      height: 100%;
       margin-left: 10px;
       overflow: hidden;
       text-overflow: ellipsis;

package/src/layout/components/lay-tag/index.vue

@@ -210,7 +210,6 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
 }
 
 function deleteMenu(item, tag?: string) {
-  debugger;
   deleteDynamicTag(item, item.path, tag);
   handleAliveRoute(route as ToRouteType);
 }

package/src/main.ts

@@ -39,7 +39,7 @@ import {
   //   UtDivider,
   // UtModalForm2
   // FormUpload2,
-  // UtForm2
+  UtForm2,
   UtGrid2
   // UtContent2,
   // UtStampBadge2
@@ -94,7 +94,7 @@ const init = ({ router, config, lang, views, env, tableConfig }) => {
     //   .component('UtDivider', UtDivider)
     // app.component('UtModalForm2', UtModalForm2);
     app.component('UtGrid2', UtGrid2);
-    // app.component('UtForm2', UtForm2);
+    app.component('UtForm2', UtForm2);
     // app.component('UtModalGrid2', UtModalGrid2);
     //   .component('UtIconSelect', UtIconSelect)
     // app.component('FormUpload2', FormUpload2);

package/src/plugins/vxe-table/index.ts

@@ -10,8 +10,8 @@ import 'xe-utils';
 import { merge, toDateString, getWhatDay } from 'xe-utils';
 import { geti18n, transformI18n } from '../i18n/index';
 // import { storageLocal } from '@utogether/utils';
-import { VxetableRender } from '@utogether/utils';
-// import { VxetableRender } from './render';
+// import { VxetableRender } from '@utogether/utils';
+import { VxetableRender } from './render';
 import { getServiceApi } from '../../api';
 
 import VXETable, { VxeUI } from 'vxe-table';

package/src/style/vxetable.scss

@@ -337,3 +337,12 @@ html[data-vxe-ui-theme='light'] {
     color: var(--udp-theme-vxeColor);
   }
 }
+
+/******************************** tab end *************************************/
+
+/******************************** preview start 预览图片组件 *************************************/
+.vxe-image-preview--operation-wrapper {
+  color: #c0c4cc;
+}
+
+/******************************** preview end *************************************/

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>