From 79a99ebe8f6467a770ee20a8024227fae8d1cf3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ZR20090193-=E9=99=88=E6=95=AC=E5=8B=87?=
 <chenjingyong@zhongruigroup.com>
Date: Tue, 22 Aug 2023 16:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Tinymce/src/Editor.vue     | 248 +++++++++---------
 .../DS.WMS.WebApi/Logs/internal-nlog.txt      |   7 +
 gslk-wmsapi-service-server/Api.xml            |  21 ++
 .../DS.WMS.WebApi/Logs/internal-nlog.txt      |   7 +
 4 files changed, 160 insertions(+), 123 deletions(-)

diff --git a/gslk-wms-web-client/src/components/Tinymce/src/Editor.vue b/gslk-wms-web-client/src/components/Tinymce/src/Editor.vue
index 0ebc8a8..1358b76 100644
--- a/gslk-wms-web-client/src/components/Tinymce/src/Editor.vue
+++ b/gslk-wms-web-client/src/components/Tinymce/src/Editor.vue
@@ -19,40 +19,41 @@
 </template>
 
 <script lang="ts">
-  import type { Editor, RawEditorSettings } from 'tinymce';
-  import tinymce from 'tinymce/tinymce';
-  import 'tinymce/themes/silver';
-  import 'tinymce/icons/default/icons';
-  import 'tinymce/plugins/advlist';
-  import 'tinymce/plugins/anchor';
-  import 'tinymce/plugins/autolink';
-  import 'tinymce/plugins/autosave';
-  import 'tinymce/plugins/code';
-  import 'tinymce/plugins/codesample';
-  import 'tinymce/plugins/directionality';
-  import 'tinymce/plugins/fullscreen';
-  import 'tinymce/plugins/hr';
-  import 'tinymce/plugins/insertdatetime';
-  import 'tinymce/plugins/link';
-  import 'tinymce/plugins/lists';
-  import 'tinymce/plugins/media';
-  import 'tinymce/plugins/nonbreaking';
-  import 'tinymce/plugins/noneditable';
-  import 'tinymce/plugins/pagebreak';
-  import 'tinymce/plugins/paste';
-  import 'tinymce/plugins/preview';
-  import 'tinymce/plugins/print';
-  import 'tinymce/plugins/save';
-  import 'tinymce/plugins/searchreplace';
-  import 'tinymce/plugins/spellchecker';
-  import 'tinymce/plugins/tabfocus';
+  import type { Editor, RawEditorSettings } from 'tinymce'
+  import tinymce from 'tinymce/tinymce'
+  import 'tinymce/themes/silver'
+  import 'tinymce/icons/default/icons'
+  import 'tinymce/plugins/advlist'
+  import 'tinymce/plugins/anchor'
+  import 'tinymce/plugins/autolink'
+  import 'tinymce/plugins/autosave'
+  import 'tinymce/plugins/code'
+  import 'tinymce/plugins/codesample'
+  import 'tinymce/plugins/directionality'
+  import 'tinymce/plugins/fullscreen'
+  import 'tinymce/plugins/hr'
+  import 'tinymce/plugins/insertdatetime'
+  import 'tinymce/plugins/link'
+  import 'tinymce/plugins/lists'
+  import 'tinymce/plugins/media'
+  import 'tinymce/plugins/nonbreaking'
+  import 'tinymce/plugins/noneditable'
+  import 'tinymce/plugins/pagebreak'
+  import 'tinymce/plugins/paste'
+  import 'tinymce/plugins/preview'
+  import 'tinymce/plugins/print'
+  import 'tinymce/plugins/save'
+  import 'tinymce/plugins/searchreplace'
+  import 'tinymce/plugins/spellchecker'
+  import 'tinymce/plugins/tabfocus'
   // import 'tinymce/plugins/table';
-  import 'tinymce/plugins/template';
-  import 'tinymce/plugins/textpattern';
-  import 'tinymce/plugins/visualblocks';
-  import 'tinymce/plugins/visualchars';
-  import 'tinymce/plugins/wordcount';
-
+  import 'tinymce/plugins/template'
+  import 'tinymce/plugins/textpattern'
+  import 'tinymce/plugins/visualblocks'
+  import 'tinymce/plugins/visualchars'
+  import 'tinymce/plugins/wordcount'
+  import { useGlobSetting } from '/@/hooks/setting'
+  const { viewUrl } = useGlobSetting()
   import {
     defineComponent,
     computed,
@@ -62,16 +63,16 @@
     watch,
     onDeactivated,
     onBeforeUnmount,
-  } from 'vue';
-  import ImgUpload from './ImgUpload.vue';
-  import { toolbar, plugins } from './tinymce';
-  import { buildShortUUID } from '/@/utils/uuid';
-  import { bindHandlers } from './helper';
-  import { onMountedOrActivated } from '/@/hooks/core/onMountedOrActivated';
-  import { useDesign } from '/@/hooks/web/useDesign';
-  import { isNumber } from '/@/utils/is';
-  import { useLocale } from '/@/locales/useLocale';
-  import { useAppStore } from '/@/store/modules/app';
+  } from 'vue'
+  import ImgUpload from './ImgUpload.vue'
+  import { toolbar, plugins } from './tinymce'
+  import { buildShortUUID } from '/@/utils/uuid'
+  import { bindHandlers } from './helper'
+  import { onMountedOrActivated } from '/@/hooks/core/onMountedOrActivated'
+  import { useDesign } from '/@/hooks/web/useDesign'
+  import { isNumber } from '/@/utils/is'
+  import { useLocale } from '/@/locales/useLocale'
+  import { useAppStore } from '/@/store/modules/app'
 
   const tinymceProps = {
     options: {
@@ -107,7 +108,7 @@
       type: Boolean,
       default: true,
     },
-  };
+  }
 
   export default defineComponent({
     name: 'Tinymce',
@@ -116,37 +117,37 @@
     props: tinymceProps,
     emits: ['change', 'update:modelValue', 'inited', 'init-error'],
     setup(props, { emit, attrs }) {
-      const editorRef = ref<Nullable<Editor>>(null);
-      const fullscreen = ref(false);
-      const tinymceId = ref<string>(buildShortUUID('tiny-vue'));
-      const elRef = ref<Nullable<HTMLElement>>(null);
+      const editorRef = ref<Nullable<Editor>>(null)
+      const fullscreen = ref(false)
+      const tinymceId = ref<string>(buildShortUUID('tiny-vue'))
+      const elRef = ref<Nullable<HTMLElement>>(null)
 
-      const { prefixCls } = useDesign('tinymce-container');
+      const { prefixCls } = useDesign('tinymce-container')
 
-      const appStore = useAppStore();
+      const appStore = useAppStore()
 
-      const tinymceContent = computed(() => props.modelValue);
+      const tinymceContent = computed(() => props.modelValue)
 
       const containerWidth = computed(() => {
-        const width = props.width;
+        const width = props.width
         if (isNumber(width)) {
-          return `${width}px`;
+          return `${width}px`
         }
-        return width;
-      });
+        return width
+      })
 
       const skinName = computed(() => {
-        return appStore.getDarkMode === 'light' ? 'oxide' : 'oxide-dark';
-      });
+        return appStore.getDarkMode === 'light' ? 'oxide' : 'oxide-dark'
+      })
 
       const langName = computed(() => {
-        const lang = useLocale().getLocale.value;
-        return ['zh_CN', 'en'].includes(lang) ? lang : 'zh_CN';
-      });
+        const lang = useLocale().getLocale.value
+        return ['zh_CN', 'en'].includes(lang) ? lang : 'zh_CN'
+      })
 
       const initOptions = computed((): RawEditorSettings => {
-        const { height, options, toolbar, plugins } = props;
-        const publicPath = import.meta.env.VITE_PUBLIC_PATH || '/';
+        const { height, options, toolbar, plugins } = props
+        const publicPath = import.meta.env.VITE_PUBLIC_PATH || '/'
         return {
           selector: `#${unref(tinymceId)}`,
           height,
@@ -166,83 +167,83 @@
             publicPath + 'resource/tinymce/skins/ui/' + skinName.value + '/content.min.css',
           ...options,
           setup: (editor: Editor) => {
-            editorRef.value = editor;
-            editor.on('init', (e) => initSetup(e));
+            editorRef.value = editor
+            editor.on('init', (e) => initSetup(e))
           },
-        };
-      });
+        }
+      })
 
       const disabled = computed(() => {
-        const { options } = props;
-        const getdDisabled = options && Reflect.get(options, 'readonly');
-        const editor = unref(editorRef);
+        const { options } = props
+        const getdDisabled = options && Reflect.get(options, 'readonly')
+        const editor = unref(editorRef)
         if (editor) {
-          editor.setMode(getdDisabled ? 'readonly' : 'design');
+          editor.setMode(getdDisabled ? 'readonly' : 'design')
         }
-        return getdDisabled ?? false;
-      });
+        return getdDisabled ?? false
+      })
 
       watch(
         () => attrs.disabled,
         () => {
-          const editor = unref(editorRef);
+          const editor = unref(editorRef)
           if (!editor) {
-            return;
+            return
           }
-          editor.setMode(attrs.disabled ? 'readonly' : 'design');
+          editor.setMode(attrs.disabled ? 'readonly' : 'design')
         },
-      );
+      )
 
       onMountedOrActivated(() => {
         if (!initOptions.value.inline) {
-          tinymceId.value = buildShortUUID('tiny-vue');
+          tinymceId.value = buildShortUUID('tiny-vue')
         }
         nextTick(() => {
           setTimeout(() => {
-            initEditor();
-          }, 30);
-        });
-      });
+            initEditor()
+          }, 30)
+        })
+      })
 
       onBeforeUnmount(() => {
-        destory();
-      });
+        destory()
+      })
 
       onDeactivated(() => {
-        destory();
-      });
+        destory()
+      })
 
       function destory() {
         if (tinymce !== null) {
-          tinymce?.remove?.(unref(initOptions).selector!);
+          tinymce?.remove?.(unref(initOptions).selector!)
         }
       }
 
       function initEditor() {
-        const el = unref(elRef);
+        const el = unref(elRef)
         if (el) {
-          el.style.visibility = '';
+          el.style.visibility = ''
         }
         tinymce
           .init(unref(initOptions))
           .then((editor) => {
-            emit('inited', editor);
+            emit('inited', editor)
           })
           .catch((err) => {
-            emit('init-error', err);
-          });
+            emit('init-error', err)
+          })
       }
 
       function initSetup(e) {
-        const editor = unref(editorRef);
+        const editor = unref(editorRef)
         if (!editor) {
-          return;
+          return
         }
-        const value = props.modelValue || '';
+        const value = props.modelValue || ''
 
-        editor.setContent(value);
-        bindModelHandlers(editor);
-        bindHandlers(e, attrs, unref(editorRef));
+        editor.setContent(value)
+        bindModelHandlers(editor)
+        bindHandlers(e, attrs, unref(editorRef))
       }
 
       function setValue(editor: Recordable, val: string, prevVal?: string) {
@@ -252,64 +253,65 @@
           val !== prevVal &&
           val !== editor.getContent({ format: attrs.outputFormat })
         ) {
-          editor.setContent(val);
+          editor.setContent(val)
         }
       }
 
       function bindModelHandlers(editor: any) {
-        const modelEvents = attrs.modelEvents ? attrs.modelEvents : null;
-        const normalizedEvents = Array.isArray(modelEvents) ? modelEvents.join(' ') : modelEvents;
+        const modelEvents = attrs.modelEvents ? attrs.modelEvents : null
+        const normalizedEvents = Array.isArray(modelEvents) ? modelEvents.join(' ') : modelEvents
 
         watch(
           () => props.modelValue,
           (val: string, prevVal: string) => {
-            setValue(editor, val, prevVal);
+            setValue(editor, val, prevVal)
           },
-        );
+        )
 
         watch(
           () => props.value,
           (val: string, prevVal: string) => {
-            setValue(editor, val, prevVal);
+            setValue(editor, val, prevVal)
           },
           {
             immediate: true,
           },
-        );
+        )
 
         editor.on(normalizedEvents ? normalizedEvents : 'change keyup undo redo', () => {
-          const content = editor.getContent({ format: attrs.outputFormat });
-          emit('update:modelValue', content);
-          emit('change', content);
-        });
+          const content = editor.getContent({ format: attrs.outputFormat })
+          emit('update:modelValue', content)
+          emit('change', content)
+        })
 
         editor.on('FullscreenStateChanged', (e) => {
-          fullscreen.value = e.state;
-        });
+          fullscreen.value = e.state
+        })
       }
 
       function handleImageUploading(name: string) {
-        const editor = unref(editorRef);
+        const editor = unref(editorRef)
         if (!editor) {
-          return;
+          return
         }
-        editor.execCommand('mceInsertContent', false, getUploadingImgName(name));
-        const content = editor?.getContent() ?? '';
-        setValue(editor, content);
+        editor.execCommand('mceInsertContent', false, getUploadingImgName(name))
+        const content = editor?.getContent() ?? ''
+        setValue(editor, content)
       }
 
       function handleDone(name: string, url: string) {
-        const editor = unref(editorRef);
+        const editor = unref(editorRef)
         if (!editor) {
-          return;
+          return
         }
-        const content = editor?.getContent() ?? '';
-        const val = content?.replace(getUploadingImgName(name), `<img src="${url}"/>`) ?? '';
-        setValue(editor, val);
+        const content = editor?.getContent() ?? ''
+        const val =
+          content?.replace(getUploadingImgName(name), `<img src="${viewUrl + url}"/>`) ?? ''
+        setValue(editor, val)
       }
 
       function getUploadingImgName(name: string) {
-        return `[uploading:${name}]`;
+        return `[uploading:${name}]`
       }
 
       return {
@@ -324,9 +326,9 @@
         editorRef,
         fullscreen,
         disabled,
-      };
+      }
     },
-  });
+  })
 </script>
 
 <style lang="less" scoped></style>
diff --git a/gslk-wmsapi-service-client/DS.WMS.WebApi/Logs/internal-nlog.txt b/gslk-wmsapi-service-client/DS.WMS.WebApi/Logs/internal-nlog.txt
index f2549fd..3db5c26 100644
--- a/gslk-wmsapi-service-client/DS.WMS.WebApi/Logs/internal-nlog.txt
+++ b/gslk-wmsapi-service-client/DS.WMS.WebApi/Logs/internal-nlog.txt
@@ -5697,3 +5697,10 @@
 2023-07-27 12:00:04.5230 Info Shutdown() called. Logger closing...
 2023-07-27 12:00:04.5230 Info Closing old configuration.
 2023-07-27 12:00:04.5926 Info Logger has been closed down.
+2023-08-22 16:14:36.3831 Info Message Template Auto Format enabled
+2023-08-22 16:14:36.4206 Info Loading assembly: NLog.Web.AspNetCore
+2023-08-22 16:14:36.7045 Info Adding target FileTarget(Name=allfile)
+2023-08-22 16:14:36.7201 Info Adding target FileTarget(Name=ownFile-web)
+2023-08-22 16:14:36.7594 Info Adding target ColoredConsoleTarget(Name=console)
+2023-08-22 16:14:36.8619 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-client\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
+2023-08-22 16:14:36.8846 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
diff --git a/gslk-wmsapi-service-server/Api.xml b/gslk-wmsapi-service-server/Api.xml
index d15ac00..c396087 100644
--- a/gslk-wmsapi-service-server/Api.xml
+++ b/gslk-wmsapi-service-server/Api.xml
@@ -283,6 +283,20 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:DS.WMS.WebApi.Controllers.CommonController.GetTruckRecord(System.String)">
+            <summary>
+            获取进出场记录
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:DS.WMS.WebApi.Controllers.CommonController.EditTruckRecord(DS.WMS.Core.System.Dtos.TruckRecordInput)">
+            <summary>
+            编辑进出记录
+            </summary>
+            <param name="model"></param>
+            <returns></returns>
+        </member>
         <member name="M:DS.WMS.WebApi.Controllers.CompanyController.#ctor(DS.WMS.Core.System.Interface.ICompanyService)">
             <summary>
             构造函数
@@ -1177,6 +1191,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:DS.WMS.WebApi.Controllers.WmsClearanceController.EditWmsClearanceTrunckInfo(DS.WMS.Core.WmsModule.Dtos.WmsClearanceInput)">
+            <summary>
+            维护清关车辆信息
+            </summary>
+            <param name="model"></param>
+            <returns></returns>
+        </member>
         <member name="T:DS.WMS.WebApi.Controllers.WmsFeeController">
             <summary>
             费用模块
diff --git a/gslk-wmsapi-service-server/DS.WMS.WebApi/Logs/internal-nlog.txt b/gslk-wmsapi-service-server/DS.WMS.WebApi/Logs/internal-nlog.txt
index 22f2e2e..7825807 100644
--- a/gslk-wmsapi-service-server/DS.WMS.WebApi/Logs/internal-nlog.txt
+++ b/gslk-wmsapi-service-server/DS.WMS.WebApi/Logs/internal-nlog.txt
@@ -9009,3 +9009,10 @@
 2023-08-22 14:41:11.7447 Info Adding target ColoredConsoleTarget(Name=console)
 2023-08-22 14:41:11.9806 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
 2023-08-22 14:41:12.0164 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2023-08-22 16:20:17.6334 Info Message Template Auto Format enabled
+2023-08-22 16:20:17.6648 Info Loading assembly: NLog.Web.AspNetCore
+2023-08-22 16:20:17.8204 Info Adding target FileTarget(Name=allfile)
+2023-08-22 16:20:17.8356 Info Adding target FileTarget(Name=ownFile-web)
+2023-08-22 16:20:17.8619 Info Adding target ColoredConsoleTarget(Name=console)
+2023-08-22 16:20:17.9722 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
+2023-08-22 16:20:17.9857 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile