视频播放下载删除

client/src/components/Tinymce/Tinymce.vue

@@ -153,7 +153,30 @@ const initOptions = computed(() => {
     skin: 'oxide',
     skin_url: '/resource/tinymce/skins/ui/oxide',
     content_css: '/resource/tinymce/skins/ui/oxide/content.min.css',
-    media_upload_handler() {},
+    media_filter_html: false,
+    video_template_callback: function (data) {
+      return (
+        '<video preload="auto" width="' +
+        data.width +
+        '" height="' +
+        data.height +
+        '"' +
+        '  controls="controls" title="nodownload" controlsList="nodownload">\n' +
+        '<source src="' +
+        data.source +
+        '"' +
+        (data.sourcemime ? ' type="' + data.sourcemime + '"' : '') +
+        ' />\n' +
+        (data.altsource
+          ? '<source src="' +
+            data.altsource +
+            '"' +
+            (data.altsourcemime ? ' type="' + data.altsourcemime + '"' : '') +
+            ' />\n'
+          : '') +
+        '</video>'
+      )
+    },
     file_picker_types: 'media', //自定义文件选择器的回调内容 此方法只有在点击上方图片按钮才会触发
     file_picker_callback: function (callback, value, meta) {
       if (meta.filetype === 'file') {

client/src/views/OaSystem/officeCenter/noticeAndLearn/add.vue

@@ -88,6 +88,15 @@ const rules = reactive<
 })
 function onSubmit(formEl: FormInstance | undefined, num?: number): void {
   if (!formEl) return
+  if (formData.value.content) {
+    /**
+     * 解决定义controlsList="nodownload"属性时tinymce组件会剔除
+     * **/
+    formData.value.content = formData.value.content.replace(
+      'title="nodownload"',
+      'controlsList="nodownload"'
+    )
+  }
   formEl.validate((valid, fields: any) => {
     if (valid) {
       let urlApi: string = '/adm/noticeAndLearn/add'

client/src/views/OaSystem/officeCenter/noticeAndLearn/detail.vue

@@ -12,9 +12,7 @@
           <ul class="prviewFile">
             <li v-for="(item, index) in fileUrls" :key="index">
               <span>
-                <a href="javascript:void(0);" @click="previewFile(item['url'])">{{
-                  item['name']
-                }}</a>
+                <a href="javascript:void(0);" @click="previewFile(item)">{{ item['name'] }}</a>
               </span>
             </li>
           </ul>
@@ -44,10 +42,17 @@ const detailForm = ref<{
 })
 const preVisiable = ref<boolean>(false)
 const currentUrl = ref<string>()
-const previewFile = (url) => {
-  preVisiable.value = true
-  // currentUrl.value = 'http://localhost:3000/test.pdf'
-  currentUrl.value = url
+function isImage(file) {
+  return /^image\//i.test(file.type)
+}
+
+const previewFile = (item) => {
+  if (isImage(item)) {
+    preVisiable.value = true
+    currentUrl.value = item['url']
+  } else {
+    window.open(item['url'])
+  }
 }
 const closeHandler = () => {
   preVisiable.value = false

zjugis-business/src/main/resources/templates/FlowProject/apply.ftl

@@ -269,7 +269,7 @@
         <div class="form-title">
           <div class="form-icon">
             <img src="/imgs/titleIcon.png" alt="">
-            <span>项目里程碑信息</span>
+            <span>项目里程碑信息11</span>
           </div>
           <div class="form-btn">
             <div id="addData" name="addData">
@@ -282,6 +282,7 @@
           <table class="form-table-info">
             <thead>
             <tr>
+              <td></td>
               <td>序号</td>
               <td>里程碑信息</td>
               <td>计划完成时间</td>

zjugis-business/src/main/resources/templates/FlowProject/js/apply.js

@@ -269,6 +269,25 @@
     trFragment.appendChild(generateTableTrHtml(lists.length-1))
     var index = lists.length - 1;
     $(".tbody").append(trFragment)
+    /**
+     * 上移、下移JS交互效果实现
+     * */
+    $(".up_btn").unbind('click')
+    $(".up_btn").click(function(){
+      var currentTrDom = $(this).parent().parent();
+      var i = currentTrDom.index();
+      if(i === 0) return;
+      var prevTrDom = $(currentTrDom).prev();
+      prevTrDom.before(currentTrDom);
+    })
+    $(".down_btn").unbind('click')
+    $(".down_btn").click(function(){
+        var currentTrDom = $(this).parent().parent();
+        var i = currentTrDom.index();
+        if(i === lists.length - 1) return;
+        var nextTrDom = $(currentTrDom).next();
+        nextTrDom.after(currentTrDom);
+    })
     $("#delBtn_" + index).click(function () {
       var i = this.id.substring(this.id.indexOf("_") + 1)
       z.ui.confirm("compid").init({
@@ -340,6 +359,7 @@
     let html = ''
     for (let i = 0; i < lists.length; i++) {
       html += '<tr class="qjsjClass" id="project_milestone_' + i + '" style="background:#fff">'
+          + '<td name="project_milestone_seq"><span class="up_btn_'+i+'">上</span><span class="down_btn_'+i+'">下</span></td>'
           + '<td name="project_milestone_seq">' + (i + 1) + '</td>'
           + '<td>'
           + '<div class="form-flex">'
@@ -384,6 +404,20 @@
     }
     tbodyQjsq.innerHTML = html
     for (let i = 0; i < lists.length; i++) {
+      if(i > 0){
+        console.log($(".up_btn_"+i))
+        $(".up_btn_"+i).click(function(){
+          alert(1)
+          var parentTrDom = $(this).parent();
+          var prevTrDom = parentTrDom.prev();
+          prevTrDom().before(parentTrDom);
+        })
+      }
+      if(i === lists.length - 1){
+        $(".down_btn_"+i).click(function(){
+
+        })
+      }
       z.ui.date("[name='ProjectMilestone[" + i + "]$planFinishTime']").init()
       if(isFirst !== '0' && viewState !== 'v') {
         $("#delBtn_" + i).click(function () {
@@ -437,7 +471,8 @@
     trDom.style.backgroundColor = "#fff";
     trDom.id = "project_milestone_" + index;
     trDom.className = 'qjsjClass';
-    trDom.innerHTML = '<td name="project_milestone_seq">' + (index + 1) + '</td>'
+    trDom.innerHTML = '<td><span class="up_btn">上</span><span class="down_btn">下</span></td>' +
+        + '<td name="project_milestone_seq">' + (index + 1) + '</td>'
         + '<td>'
         + '<div class="form-flex">'
         + '<div class="form-item" style="width: 100%;margin-right: 5px;">'

zjugis-module-infra/zjugis-module-infra-biz/src/main/resources/bootstrap-local.yaml

@@ -9,7 +9,7 @@ spring:
     nacos:
       server-addr: 10.10.10.7:8848
       discovery:
-        namespace: d62c66f5-9ddc-40e9-9716-65f65557a557 # 命名空间。这里使用 dev 开发环境
+        namespace: b8c5fc93-8b01-491f-b75a-3b99d1e21f42 # 命名空间。这里使用 dev 开发环境
         metadata:
           version: 1.0.0 # 服务实例的版本号，可用于灰度发布