修改国际化文本，文档搜索

src/components/NamingRuleSearch/index.vue

@@ -64,7 +64,7 @@ export default {
   data() {
     return {
       searchRuleList: [],
-      typeOptions: [this.$t('namingRule.Doc-Phase'), this.$t('namingRule.Doc-Type'), this.$t('namingRule.Doc-Format')],
+      typeOptions: [this.$t('namingRule.Doc-Stage'), this.$t('namingRule.Doc-Type'), this.$t('namingRule.Doc-Format')],
       operateOptions: [this.$t('namingRule.And'), this.$t('namingRule.Or'),this.$t('namingRule.Equalto')],
     }
   },

src/locales/lang/en-US/global.js

@@ -130,8 +130,6 @@ export default {
   'global.asc': 'Asc',
   'global.Name-Rule': 'Naming Rule',
   'global.Apply-Name-Rule': 'Apply Naming Rule',
-  'global.Doc-Stage': 'Doc Stage',
-  'global.Doc-Type': 'Doc Type',
   'global.Task-Type': 'Task Type',
   'global.Auto-Name': 'AutoName',
   'global.Delay': 'Delay',
@@ -178,4 +176,6 @@ export default {
   'global.View': 'View',
   'global.loadMore': 'Add more',
   'global.withoutMore': 'No more data',
+  'global.Collapse': 'Collapse',
+  'global.Expand': 'Expand',
 }

src/locales/lang/en-US/namingRule/namingRule.js

@@ -2,8 +2,8 @@ export default {
 'namingRule.Equalto': 'Equal to',
 'namingRule.And': 'And',
 'namingRule.Or': 'Or',
-'namingRule.Doc-Phase': 'Document Phase',
-'namingRule.Doc-Type': 'Document Type',
+'namingRule.Doc-Stage': 'Doc Stage',
+'namingRule.Doc-Type': 'Doc Type',
 'namingRule.Doc-Format': 'Document Format',
 'namingRule.Metadata': 'Metadata Attributes',
 }

src/locales/lang/zh-CN/global.js

@@ -129,8 +129,6 @@ export default {
   'global.asc': '升序',
   'global.Name-Rule': '命名规则',
   'global.Apply-Name-Rule': '应用命名规则',
-  'global.Doc-Stage': '文档阶段',
-  'global.Doc-Type': '文档类型',
   'global.Task-Type': '任务类型',
   'global.Auto-Name': '自动命名',
   'global.Delay': '延期',
@@ -177,4 +175,6 @@ export default {
   'global.View': '查看',
   'global.loadMore': '加载更多',
   'global.withoutMore': '没有更多数据',
+  'global.Collapse': '收回',
+  'global.Expand': '展开',
 }

src/locales/lang/zh-CN/namingRule/namingRule.js

@@ -2,7 +2,7 @@ export default {
 'namingRule.Equalto': '等于',
 'namingRule.And': '并且',
 'namingRule.Or': '或者',
-'namingRule.Doc-Phase': '文档阶段',
+'namingRule.Doc-Stage': '文档阶段',
 'namingRule.Doc-Type': '文档类型',
 'namingRule.Doc-Format': '文档格式',
 'namingRule.Metadata': '元数据属性',

src/locales/lang/zh-HK/global.js

@@ -129,8 +129,6 @@ export default {
   'global.asc': '升序',
   'global.Name-Rule': '命名規則',
   'global.Apply-Name-Rule': '應用命名規則',
-  'global.Doc-Stage': '文檔階段',
-  'global.Doc-Type': '文檔類型',
   'global.Task-Type': '任務類型',
   'global.Auto-Name': '自動命名',
   'global.Delay': '延期',
@@ -177,4 +175,6 @@ export default {
   'global.View': '查看',
   'global.loadMore': '加載更多',
   'global.withoutMore': '沒有更多數據',
+  'global.Collapse': '收回',
+  'global.Expand': '展開',
 }

src/locales/lang/zh-HK/namingRule/namingRule.js

@@ -2,7 +2,7 @@ export default {
 'namingRule.Equalto': '等於',
 'namingRule.And': '並且',
 'namingRule.Or': '或者',
-'namingRule.Doc-Phase': '文檔階段',
+'namingRule.Doc-Stage': '文檔階段',
 'namingRule.Doc-Type': '文檔類型',
 'namingRule.Doc-Format': '文檔格式',
 'namingRule.Metadata': '元數據屬性',

src/permission.js

@@ -122,6 +122,7 @@ router.beforeEach(async (to, from, next) => {
       if (window.location.href.startsWith('http://localhost')) {
         next({ path: '/user/login' })
       } else {
+        console.log(to);
         if(to.fullPath !== '/'){
           window.location.href = `https://dev.autocde.com/login?redirect=${to.fullPath}`
         }else{

src/views/document/comp/searchFileOrFolder.vue

@@ -0,0 +1,60 @@
+<template>
+  <a-form layout="inline">
+    <a-row>
+      <a-form-item :label="$t('global.Name')">
+        <a-input placeholder="Search File or Folder" v-model="formInline.Name"></a-input>
+      </a-form-item>
+      <template v-if="!type">
+        <a-form-item :label="$t('namingRule.Doc-Stage')">
+          <a-input v-model="formInline.doc_stage"></a-input>
+        </a-form-item>
+        <a-form-item :label="$t('namingRule.Doc-Type')">
+          <a-input v-model="formInline.doc_type"></a-input>
+        </a-form-item>
+        <a-form-item :label="$t('global.Name-Rule')">
+          <a-input v-model="formInline.naming_rule"></a-input>
+        </a-form-item>
+      </template>
+      <a-form-item>
+      <div class="flex-start">
+        <a @click="type = !type" style="margin-right: 20px">
+          {{ type ? $t('global.Expand') : $t('global.Collapse') }}
+          <a-icon type="down" v-if="type" />
+          <a-icon type="up" v-else />
+        </a>
+        <span>
+          <a-button type="primary">{{ $t('global.Search') }}</a-button>
+          <a-button style="margin-left: 8px">{{ $t('global.Reset') }}</a-button>
+        </span>
+      </div>
+       </a-form-item>
+    </a-row>
+  </a-form>
+</template>
+
+<script>
+export default {
+  name: 'searchFileOrFolder',
+  props: {},
+  components: {},
+  data() {
+    return {
+      formInline: {
+        Name: '',
+        doc_stage: '',
+        doc_type: '',
+        naming_rule: '',
+      },
+      type: true,
+    }
+  },
+  created() {},
+  methods: {
+    handleSubmit(e) {
+      console.log(this.formInline)
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped></style>

src/views/document/containerDetails.vue

@@ -40,10 +40,10 @@
               <a-descriptions-item v-if="basicInfo.naming_rule" :label="$t('global.Name-Rule')"
                 >{{ basicInfo.naming_rule ? basicInfo.naming_rule.name : '' }}
               </a-descriptions-item>
-              <a-descriptions-item v-if="basicInfo.doc_stage" :label="$t('global.Doc-Stage')"
+              <a-descriptions-item v-if="basicInfo.doc_stage" :label="$t('namingRule.Doc-Stage')"
                 >{{ forMatValue(basicInfo.doc_stage, 2) }}
               </a-descriptions-item>
-              <a-descriptions-item v-if="basicInfo.doc_type" :label="$t('global.Doc-Type')"
+              <a-descriptions-item v-if="basicInfo.doc_type" :label="$t('namingRule.Doc-Type')"
                 >{{ forMatValue(basicInfo.doc_type, 3) }}
               </a-descriptions-item>
               <a-descriptions-item v-for="(value, key, index) in basicInfo.naming_rules" :key="index" :label="key"

src/views/document/dashboard.vue

@@ -324,26 +324,9 @@
                       </a-tooltip>
                     </a-space>
                   </a>
-                  <div class="table-page-search-wrapper">
-                    <a-form layout="inline">
-                      <a-row :gutter="24">
-                        <template v-if="currentType == 'container'">
-                          <a-col :md="6" :sm="10">
-                            <a-form-item :label="$t('doc.Sort')">
-                              <a-select
-                                :placeholder="$t('global.Placeholder-select')"
-                                v-model="order_by"
-                                @change="getDocOpenList"
-                              >
-                                <a-select-option label="Desc" value="desc">{{ $t('global.desc') }}</a-select-option>
-                                <a-select-option label="Asc" value="asc">{{ $t('global.asc') }}</a-select-option>
-                              </a-select>
-                            </a-form-item>
-                          </a-col>
-                        </template>
-                      </a-row>
-                    </a-form>
-                  </div>
+                  <template v-if="currentType == 'container'">
+                    <searchFileOrFolder/>
+                  </template>
                   <div v-if="show == 'transverse'">
                     <a-table
                       ref="showTable"
@@ -815,14 +798,14 @@
               }}</a-select-option>
             </a-select>
           </a-form-model-item>
-          <a-form-model-item :label="$t('global.Doc-Stage')" prop="doc_stage">
+          <a-form-model-item :label="$t('namingRule.Doc-Stage')" prop="doc_stage">
             <a-select :placeholder="$t('global.Placeholder-select')" v-model="containerForm.doc_stage">
               <a-select-option v-for="(item, i) in docStageTable.options" :key="i" :value="item.value">{{
                 item.lang.en
               }}</a-select-option>
             </a-select>
           </a-form-model-item>
-          <a-form-model-item :label="$t('global.Doc-Type')" prop="doc_type">
+          <a-form-model-item :label="$t('namingRule.Doc-Type')" prop="doc_type">
             <a-select :placeholder="$t('global.Placeholder-select')" v-model="containerForm.doc_type">
               <a-select-option v-for="(item, i) in docTypeTable.options" :key="i" :value="item.value">{{
                 item.lang.en
@@ -1248,6 +1231,7 @@ import { enabledDictionaryList, customFieldt } from '@/api/setting/index.js'
 import { userInfoItems, downloadFile } from '@/api/user'
 import { postApproval, revokeApproval, approvalList } from '@/api/Approval/index.js'
 import { autoNaming } from '@/api/project/detail/index'
+import { renderSize, capitalize, generateUUIDv4, initPathParams } from '@/utils/util'
 import Editor from '@/components/Editor/QuillEditor.vue'
 import Acl from '@/components/Acl/index.vue'
 import AclUser from '@/components/AclUser/index.vue'
@@ -1257,7 +1241,7 @@ import permissionsManagement from './comp/permissionsManagement.vue'
 import previewFile from './comp/previewFile.vue'
 import shareFile from './comp/shareFile.vue'
 import editColumns from './comp/editColumns.vue'
-import { renderSize, capitalize, generateUUIDv4, initPathParams } from '@/utils/util'
+import searchFileOrFolder from './comp/searchFileOrFolder.vue'
 
 import Vue from 'vue'
 import VueDraggableResizable from 'vue-draggable-resizable'
@@ -1275,6 +1259,7 @@ export default {
     shareFile,
     editColumns,
     NamingRuleSearch,
+    searchFileOrFolder
   },
   data() {
     return {
@@ -3910,12 +3895,6 @@ export default {
       padding: 12px;
     }
   }
-  .ant-transfer {
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-  }
-
   .ant-table-row {
     cursor: pointer;
   }

src/views/project/detail/TaskBatch.vue

@@ -21,7 +21,7 @@
             :placeholder="$t('global.Placeholder-input')"
             v-model="dataHeader[index].name"
           />
-          <span slot="docStage"><span style="color: #ff0000">*</span> {{ $t('global.Doc-Stage') }}</span>
+          <span slot="docStage"><span style="color: #ff0000">*</span> {{ $t('namingRule.Doc-Stage') }}</span>
           <div slot="doc_stage" slot-scope="text, record, index">
             <a-select
               :placeholder="$t('global.Placeholder-select')"
@@ -33,7 +33,7 @@
               }}</a-select-option>
             </a-select>
           </div>
-          <span slot="docType"><span style="color: #ff0000">*</span> {{ $t('global.Doc-Type') }}</span>
+          <span slot="docType"><span style="color: #ff0000">*</span> {{ $t('namingRule.Doc-Type') }}</span>
           <div slot="doc_type" slot-scope="text, record, index">
             <a-select
               :placeholder="$t('global.Placeholder-select')"

src/views/project/detail/TaskCreate.vue

@@ -39,14 +39,14 @@
               </a-select>
             </a-form-model-item>
 
-            <a-form-model-item :label="$t('global.Doc-Stage')" prop="doc_stage">
+            <a-form-model-item :label="$t('namingRule.Doc-Stage')" prop="doc_stage">
               <a-select :placeholder="$t('global.Placeholder-select')" v-model="form.doc_stage">
                 <a-select-option v-for="(item, i) in docStageTable.options" :key="i" :value="item.value">{{
                   item.lang.en
                 }}</a-select-option>
               </a-select>
             </a-form-model-item>
-            <a-form-model-item :label="$t('global.Doc-Type')" prop="doc_type">
+            <a-form-model-item :label="$t('namingRule.Doc-Type')" prop="doc_type">
               <a-select :placeholder="$t('global.Placeholder-select')" v-model="form.doc_type">
                 <a-select-option v-for="(item, i) in docTypeTable.options" :key="i" :value="item.value">{{
                   item.lang.en

src/views/project/detail/TaskEdit.vue

@@ -56,14 +56,14 @@
                 }}</a-select-option>
               </a-select>
             </a-form-model-item>
-            <a-form-model-item :label="$t('global.Doc-Stage')" prop="doc_stage">
+            <a-form-model-item :label="$t('namingRule.Doc-Stage')" prop="doc_stage">
               <a-select :placeholder="$t('global.Placeholder-select')" v-model="form.doc_stage">
                 <a-select-option v-for="(item, i) in docStageTable.options" :key="i" :value="item.value">{{
                   item.lang.en
                 }}</a-select-option>
               </a-select>
             </a-form-model-item>
-            <a-form-model-item :label="$t('global.Doc-Type')" prop="doc_type">
+            <a-form-model-item :label="$t('namingRule.Doc-Type')" prop="doc_type">
               <a-select :placeholder="$t('global.Placeholder-select')" v-model="form.doc_type">
                 <a-select-option v-for="(item, i) in docTypeTable.options" :key="i" :value="item.value">{{
                   item.lang.en

src/views/project/detail/TaskView.vue

@@ -148,10 +148,10 @@
                   <a-descriptions-item v-if="form.task_type" :label="$t('global.Task-Type')"
                     >{{ forMatValue(form.task_type, 1) }}
                   </a-descriptions-item>
-                  <a-descriptions-item v-if="form.doc_stage" :label="$t('global.Doc-Stage')"
+                  <a-descriptions-item v-if="form.doc_stage" :label="$t('namingRule.Doc-Stage')"
                     >{{ forMatValue(form.doc_stage, 2) }}
                   </a-descriptions-item>
-                  <a-descriptions-item v-if="form.doc_type" :label="$t('global.Doc-Type')"
+                  <a-descriptions-item v-if="form.doc_type" :label="$t('namingRule.Doc-Type')"
                     >{{ forMatValue(form.doc_type, 3) }}
                   </a-descriptions-item>