Merge remote-tracking branch 'origin/master'

src/views/mallResourceDevelopment/file/fileByApply/fileByApplyDetail.vue

@@ -22,6 +22,12 @@
       </div>
     </template>
 
+    <div style="display: flex">
+      <span style="margin-top: 20px; margin-left: 10px; font-size: 18px; font-weight: bold"
+        >基本信息</span
+      >
+    </div>
+
     <Description
       size="middle"
       title=" "
@@ -29,13 +35,14 @@
       :column="3"
       :data="BasicInfoData"
       :schema="BasicInfoSchema"
+    />
+
+    <div style="display: flex; flex-direction: column">
+      <span style="margin-top: 20px; margin-left: 10px; font-size: 18px; font-weight: bold"
+        >管理属性</span
       >
-      <template #action>
-        <div style="display: flex">
-          <span style="font-size: 18px; font-weight: bold; margin-right: 1550px">基本信息</span>
     </div>
-      </template>
-    </Description>
+
     <Description
       size="middle"
       title=" "
@@ -43,13 +50,13 @@
       :column="3"
       :data="ManagePropertyData"
       :schema="ManagePropertySchema"
-    >
-      <template #action>
+    />
+
     <div style="display: flex">
-          <span style="font-size: 18px; font-weight: bold; margin-right: 1550px">管理属性</span>
+      <span style="margin-top: 20px; margin-left: 10px; font-size: 18px; font-weight: bold"
+        >权限信息</span
+      >
     </div>
-      </template>
-    </Description>
     <Description
       size="middle"
       title=" "
@@ -57,13 +64,7 @@
       :column="3"
       :data="permissionsData"
       :schema="permissionsInfo"
-    >
-      <template #action>
-        <div style="display: flex">
-          <span style="font-size: 18px; font-weight: bold; margin-right: 1550px">权限信息</span>
-        </div>
-      </template>
-    </Description>
+    />
     <div class="mianBodyEditContainer">
       <Tabs style="padding-left: 20px" v-model:activeKey="page" size="large">
         <a-tab-pane key="1" tab="采样数据">
@@ -138,7 +139,7 @@
                 </template>
               </BasicTable>
             </div>
-            <span style="font-weight: bold; font-size: 16px; margin-left: 35px">推送记录</span>
+            <span style="margin-left: 35px; font-size: 16px; font-weight: bold">推送记录</span>
             <div class="flex">
               <div style="width: 45%">
                 <BasicTable @register="registerPushTypeTable" />
@@ -420,11 +421,11 @@
 </script>
 <style scoped lang="scss">
   .editor {
-    background-color: white;
     height: 560px;
-    border: 1px solid #d9d9d9;
-    padding: 16px;
     margin-bottom: 8px;
+    padding: 16px;
+    border: 1px solid #d9d9d9;
+    background-color: white;
   }
 
   .editor textarea {

src/views/scriptDevelopment/shellDevelopment/addFile/tempalte.data.ts

@@ -162,7 +162,7 @@ export const formSchemaTemplate: any = [
     field: 'fileType',
     label: '文件类型',
     component: 'Input',
-    defaultValue: '.sh格式文件',
+    defaultValue: 'Shell',
     colProps: { span: 8 },
     componentProps: {
       readonly: true,
@@ -190,14 +190,15 @@ export const formSchemaTemplate: any = [
   {
     field: 'model',
     label: '目录权属模式',
-    component: 'RadioGroup',
-    defaultValue: '本级定义',
+    component: 'Input',
+    defaultValue: '资源自定义',
     colProps: { span: 8 },
     componentProps: {
-      options: [
-        { label: '本级定义', value: '本级定义' },
-        { label: '资源自定义', value: '资源自定义' },
-      ],
+      readonly: true,
+      style: {
+        border: 'none',
+        backgroundColor: 'transparent',
+      },
     },
   },
   {

src/views/scriptDevelopment/shellDevelopment/addFile/templateModal.vue

@@ -44,6 +44,7 @@
   //初始化表单
   const [registerForm, { setFieldsValue, updateSchema, resetFields, validate }] = useForm({
     labelWidth: 100,
+    labelAlign: 'left',
     baseColProps: { lg: 24, md: 24 },
     schemas: formSchemaTemplate,
     showActionButtonGroup: false,

src/views/scriptDevelopment/shellDevelopment/shellExecute/handleSubmit/submitModal.vue

@@ -47,16 +47,6 @@
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     resetFields();
     setModalProps({ confirmLoading: false });
-    isUpdate.value = !!data?.isUpdate;
-    isMove.value = !!data?.isMove;
-    if (unref(isUpdate)) {
-      // 获取行数据的id
-      rowId.value = data.record.businessId;
-      // 塞值
-      setFieldsValue({
-        ...data.record,
-      });
-    }
   });
 
   // onMounted(){}
@@ -66,11 +56,13 @@
 
   /**确定按钮*/
   async function handleSubmit() {
-    if (textareaValue.value.trim() == '') {
-      closeModal();
+    try {
+      setModalProps({ confirmLoading: true });
+      await validate();
       emit('success', textareaValue.value);
-    } else {
-      createMessage.error('请填写内容');
+      closeModal();
+    } finally {
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>

src/views/scriptDevelopment/shellDevelopment/shellExecute/handleSubmit/tempalte.data.ts

@@ -212,14 +212,14 @@ export const formSchemaTemplate: any = [
     },
   },
 ];
-export const importFormSchema: any[] = [
+export const importFormSchema: FormSchema[] = [
   {
     field: 'importVersionAlert',
     label: '版本描述',
-    slot: 'fileMethods',
-    component: 'InputTextarea',
+    component: 'InputTextArea',
     colProps: { lg: 24, md: 24 },
     componentProps: {
+      rows: 8,
       placeholder: '最多255个字符',
     },
     required: true,

src/views/scriptDevelopment/shellDevelopment/shellExecute/optionsModal.vue

 <template>
   <BasicModal
-    width="30%"
+    width="41%"
     v-bind="$attrs"
     @register="registerModal"
     :title="title"

src/views/scriptDevelopment/shellDevelopment/shellExecute/shellExecute.vue

@@ -14,31 +14,6 @@
           <span style="color: grey; margin-left: 10px"> {{ path }}</span>
         </div>
         <div style="display: flex; margin-left: 500px">
-          <!--          新窗口运行-->
-          <!-- <Tooltip placement="top" title="新窗口运行">
-        <a-button
-          type="primary"
-          style="margin-right: 10px; margin-left: 500px"
-          @click="handleExecute"
-        >
-          <Icon icon="si:play-forward-duotone" :size="20" />
-        </a-button>
-      </Tooltip> -->
-
-          <!--          运行-->
-          <!-- <Tooltip placement="top" title="运行">
-        <a-button type="primary" style="margin-right: 10px" @click="handleExecute">
-          <Icon icon="si:play-line" :size="20" />
-        </a-button>
-      </Tooltip> -->
-
-          <!--          执行记录-->
-          <!-- <Tooltip placement="top" title="执行记录">
-        <a-button type="primary" style="margin-right: 10px" @click="handleRecord">
-          <Icon icon="si:clock-alt-line" :size="20" />
-        </a-button>
-      </Tooltip> -->
-
           <!--          提交版本-->
           <Tooltip placement="top" title="提交版本">
             <a-button type="primary" style="margin-right: 10px" @click="handleSubmit">
@@ -46,7 +21,6 @@
               <!--                <Icon icon="majesticons:cloud-upload-line" :size="20" />-->
             </a-button>
           </Tooltip>
-
           <!--          版本管理-->
           <Tooltip placement="top" title="版本管理">
             <a-button type="primary" style="margin-right: 10px" @click="handleVersion">
@@ -54,7 +28,6 @@
               <!--                <Icon icon="majesticons:file-search-line" :size="20" />-->
             </a-button>
           </Tooltip>
-
           <!--          参数配置-->
           <Tooltip placement="top" title="参数配置">
             <a-button type="primary" style="margin-right: 10px" @click="handleOptions">
@@ -62,15 +35,6 @@
               <!--                <Icon icon="majesticons:link-circle-line" :size="20" />-->
             </a-button>
           </Tooltip>
-
-          <!--          格式化-->
-          <!--          <Tooltip placement="top" title="格式化">-->
-          <!--            <a-button type="primary" style="margin-right: 10px" @click="handleChange">-->
-          <!--              格式化-->
-          <!--              &lt;!&ndash;                <Icon icon="gg:align-left" :size="20" />&ndash;&gt;-->
-          <!--            </a-button>-->
-          <!--          </Tooltip>-->
-
           <!--          保存-->
           <Tooltip placement="top" title="保存">
             <a-button type="primary" style="margin-right: 10px" @click="handleSave">
@@ -78,15 +42,6 @@
               <!--              <Icon icon="majesticons:save-line" :size="20" />-->
             </a-button>
           </Tooltip>
-          <!--
-      <Tooltip placement="top" :title="layout === 'single' ? '版本对比' : '结束对比'">
-        <a-button type="primary" style="margin-right: 10px" @click="toggleLayout">
-          <Icon
-            :icon="layout === 'single' ? 'majesticons:user-line' : 'majesticons:users-line'"
-            :size="20"
-          />
-        </a-button>
-      </Tooltip> -->
         </div>
       </div>
     </template>
@@ -95,33 +50,11 @@
         <div class="codeEditorH" style="padding: 0 15px" v-if="layout === 'single'">
           <CodeEditor v-model:value="jsonData" :mode="MODE.SHELL" />
         </div>
-        <div v-else class="editor-container">
-          <div class="editor-wrapper" style="height: 600px">
-            <div
-              class="editor-left"
-              ref="editorLeft"
-              style="flex: 1; width: 50%; overflow: hidden"
-              :scrollbar="false"
-            >
-              <CodeEditor v-model:value="jsonDataLeft" :mode="MODE.JSON" />
-            </div>
-            <div
-              class="editor-right"
-              ref="editorRight"
-              style="flex: 1; width: 50%; overflow: hidden"
-              :scrollbar="false"
-            >
-              <CodeEditor v-model:value="jsonDataRight" :mode="MODE.JSON" />
-            </div>
-          </div>
-        </div>
       </div>
     </div>
     <OptionsModal @register="registerModal" />
-    <ResultModal @register="registerResultModal" />
     <PreviewModal @register="registerPreviewModal" />
-    <RecordModal @register="registerRecordModal" />
-    <SubmitModal @register="registerSubmitModal" />
+    <SubmitModal @register="registerSubmitModal" @success="handleSuccess" />
     <VersionManagementModal @register="registerVersionManagementModal" />
   </PageWrapper>
 </template>
@@ -155,8 +88,6 @@
   const route = useRoute();
   const path = ref('');
   const layout = ref('single');
-  const jsonDataLeft = jsonData;
-  const jsonDataRight = jsonData;
   const editorLeft = ref<HTMLElement | null>(null);
   const editorRight = ref<HTMLElement | null>(null);
   const toggleLayout = () => {
@@ -164,16 +95,9 @@
   };
   const [registerModal, { openModal }] = useModal();
   const [registerSubmitModal, { openModal: openSubmitModal }] = useModal();
-  const [registerResultModal, { openModal: openResultModal }] = useModal();
   const [registerPreviewModal, { openModal: openPreviewModal }] = useModal();
   const [registerVersionManagementModal, { openModal: openVersionManagementModal }] = useModal();
-  const [registerRecordModal, { openModal: openRecordModal }] = useModal();
-  const [registerForm] = useForm({
-    labelWidth: 100,
-    baseColProps: { lg: 6, md: 4 },
-    schemas: formSchema,
-    showActionButtonGroup: false,
-  });
+
   /** 部门树的select*/
   function handleSelect() {
     openPreviewModal(true, {
@@ -185,16 +109,7 @@
       title: '参数配置',
     });
   }
-  function handleExecute() {
-    openResultModal(true, {
-      title: '执行结果',
-    });
-  }
-  function handleRecord() {
-    openRecordModal(true, {
-      title: '执行记录',
-    });
-  }
+
   //提交版本按钮
   function handleSubmit() {
     openSubmitModal(true, {
@@ -206,11 +121,15 @@
   function handleVersion() {
     openVersionManagementModal(true, {
       title: '版本管理',
+      id: route.query.id,
     });
   }
   function handleChange() {
     createMessage.success('格式化成功');
   }
+  function handleSuccess() {
+    createMessage.success('提交成功');
+  }
   //保存按钮
   function handleSave() {
     createMessage.success('保存成功');
@@ -236,7 +155,10 @@
   function goBack() {
     // // 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
     // go('/scriptDevelopment/shellDevelopment/index');
-    router.back();
+    // router.go(-1);
+    router.push({
+      path: '/scriptDevelopment/shellDevelopment/index',
+    });
   }
   //同步滚动
   const handleScroll = () => {
@@ -259,7 +181,6 @@
     }
   });
   onMounted(async () => {
-    console.log(111111111111);
     path.value = getPathById(route.query.id);
     await nextTick(() => {
       if (editorLeft.value && editorRight.value) {
@@ -269,34 +190,7 @@
     });
   });
 </script>
-<style scoped>
-  .editor-container {
-    display: flex;
-  }
-
-  .editor-left {
-    flex: 1;
-    height: 100%;
-    overflow-y: hidden;
-  }
-
-  .editor-right {
-    flex: 1;
-    height: 100%;
-    overflow-y: hidden;
-  }
-
-  .editor-wrapper {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .editor-left,
-  .editor-right {
-    flex: 1;
-    overflow: hidden;
-  }
-
+<style lang="less" scoped>
   :deep(.CodeMirror) {
     height: 700px !important;
   }

src/views/scriptDevelopment/shellDevelopment/shellExecute/versionManagementModal.vue

@@ -31,7 +31,7 @@
                     icon: 'ant-design:rollback-outlined',
                     tooltip: '回退版本',
                     popConfirm: {
-                      title: '是否确认回退版本',
+                      title: '是否确认回退至该版本',
                       confirm: handleVersionRollback,
                     },
                   },
@@ -52,11 +52,13 @@
   import { versionColumns, versionSchema } from './version.data';
   import { message } from 'ant-design-vue';
   import { router } from '@/router';
-
+  const id = ref();
   const title = ref();
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     setModalProps({ confirmLoading: false });
+    console.log(data)
     title.value = data.title;
+    id.value = data.id;
   });
   const [registerTable] = useTable({
     dataSource: versionSchema,
@@ -71,14 +73,21 @@
   });
   function handleDetail() {
     console.log('查看详情');
+    console.log(id.value);
     router.push({
       path: '/scriptDevelopment/shellDevelopment/shellExecute/versionDetail',
+      query: {
+        id: id.value,
+      },
     });
   }
   function modEdit() {
     console.log('版本对比');
     router.push({
       path: '/scriptDevelopment/shellDevelopment/shellExecute/versionCompare',
+      query: {
+        id: id.value,
+      },
     });
   }
   function handleVersionRollback() {