eoss 0.1.0-alpha.21 → 0.1.0-alpha.22

package/packages/form/src/form-item.vue

@@ -4,7 +4,8 @@
     :style="itemStyle"
     :class="[
       {
-        'es-form-item--feedback': esForm && esForm.statusIcon,
+    'es-form-item--feedback': esForm && esForm.statusIcon,
+        'es-form--label-top': labelPosition === 'top',
         'is-error': validateState === 'error',
         'is-validating': validateState === 'validating',
         'is-success': validateState === 'success',
@@ -21,6 +22,7 @@
       :class="labelClass"
       :labelFor="labelFor"
       :contents="label"
+      :position="labelPosition"
       v-if="label || $slots.label"
     >
       <slot name="label" v-if="$slots.label"></slot>
@@ -100,10 +102,15 @@ export default {
      * 标签文本
      */
     label: [String, Array],
+    /**
+     * 标签位置
+     */
+    labelPosition: String,
     /**
      * 标签宽度
      */
     labelWidth: String,
+    
     /**
      * 字段名，用于表单验证和数据绑定
      */
@@ -257,7 +264,7 @@ export default {
       const labelWidth = this.labelWidth || form.labelWidth;
       const label = this.label || this.$slots.label;
       // 快速路径：无需计算样式
-      if (!label || form.labelPosition === 'top' || form.inline) return {};
+      if (!label || this.labelPosition === 'top' || form.labelPosition === 'top' || form.inline) return {};
       if (!this.labelWidth && this.isNested) return {};
 
       // 构建样式对象

package/packages/form/src/label-wrap.vue

@@ -44,6 +44,8 @@ export default {
   componentsName: 'LabelWrap',
   inheritAttrs: false,
   props: {
+    // 标签位置
+    position: String,
     // 标签关联的表单字段ID，确保label与form field正确关联
     labelFor: String,
     // 统一使用isAutoWidth来控制自动宽度计算
@@ -82,7 +84,8 @@ export default {
       if (
         !this.autoWidth &&
         this.esForm &&
-        this.esForm.labelPosition !== 'top'
+        this.esForm.labelPosition !== 'top' &&
+        this.position !== 'top'
       ) {
         const labelWidth = parseInt(
           (this.esFormItem || {}).labelWidth ||

package/packages/login/src/login.vue

@@ -148,7 +148,9 @@
     <transition name="launch-fade">
       <div class="es-launch" :style="launchStyles" v-show="showLaunch">
         <div class="es-launch__text is-user">{{ userName }}，您好！</div>
-        <div class="es-launch__text">欢迎进入{{ welcome||subsystemName }}</div>
+        <div class="es-launch__text">
+          欢迎进入{{ welcome || subsystemName }}
+        </div>
       </div>
     </transition>
 
@@ -602,7 +604,7 @@ export default {
   beforeCreate() {},
   created() {
     this.initLogin();
-    this.alertNotice = throttle(300, true, this.doAlert);
+    this.alertNotice = throttle(300, this.doAlert);
   },
   mounted() {},
   /**
@@ -797,42 +799,69 @@ export default {
       }
     },
     /**
-     * @param {Object} contents - 弹窗内容
+     * 显示弹窗提示
+     * @param {string|Object} contents - 弹窗内容，字符串表示内容文本，对象表示完整配置
      */
     doAlert(contents) {
-      let { content, title, ...config } = contents;
+      let content, title, config;
+      if (typeof contents === 'string') {
+        content = contents;
+        title = '提示';
+        config = {};
+      } else {
+        ({ content, title, ...config } = contents);
+      }
       const regex = /\.md$/;
       let isMarkdown = regex.test(content);
+      const showAlert = () => {
+        console.log('showAlert called', { content, isMarkdown, title });
+        MessageBox.alert(content, title, {
+          dangerouslyUseHTMLString: isMarkdown,
+          setHeight: isMarkdown,
+          notice: true,
+          ...config
+        })
+          .then(() => {
+            this.$emit('notice', 1, { content, title, ...config });
+          })
+          .catch(() => {
+            this.$emit('notice', 0, { content, title, ...config });
+          });
+      };
       if (isMarkdown) {
-        content = ajax({ url: content });
-        content = content
-          ? content
-              .replace(/^#{1,6}\s+(.*?)$/gm, (match, text) => {
-                const hLevel = match.indexOf('#');
-                return `<h${hLevel}>${text}</h${hLevel}>`;
-              })
-              .replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>')
-              .replace(/\*(.*?)\*/g, '<em>$1</em>')
-              .replace(
-                /\[(.*?)\]\((.*?)\)/g,
-                '<a href="$2" target="_blank">$1</a>'
-              )
-              .replace(/^(.*?)$/gm, '<p>$1</p>')
-          : content;
-        content = DOMPurify.sanitize(content);
+        ajax({ url: content })
+          .then((mdContent) => {
+            // 兼容接口返回对象的情况（如 { rCode: 0, results: '...' }）
+            if (mdContent && typeof mdContent === 'object') {
+              mdContent =
+                mdContent.results || mdContent.data || mdContent.content || '';
+            }
+            mdContent = String(mdContent || '');
+            content = mdContent
+              ? mdContent
+                  .replace(/^#{1,6}\s+(.*?)$/gm, (match, text) => {
+                    const hLevel = match.indexOf('#');
+                    return `<h${hLevel}>${text}</h${hLevel}>`;
+                  })
+                  .replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>')
+                  .replace(/\*(.*?)\*/g, '<em>$1</em>')
+                  .replace(
+                    /\[(.*?)\]\((.*?)\)/g,
+                    '<a href="$2" target="_blank">$1</a>'
+                  )
+                  .replace(/^(.*?)$/gm, '<p>$1</p>')
+              : content;
+            content = DOMPurify.sanitize(content);
+            showAlert();
+          })
+          .catch((error) => {
+            console.error('加载 Markdown 内容失败:', error);
+            content = '内容加载失败';
+            isMarkdown = false;
+          });
+      } else {
+        showAlert();
       }
-      MessageBox.alert(content, title, {
-        dangerouslyUseHTMLString: isMarkdown,
-        setHeight: isMarkdown,
-        notice: true,
-        ...config
-      })
-        .then(() => {
-          this.$emit('notice', 1, { content, title, ...config });
-        })
-        .catch(() => {
-          this.$emit('notice', 0, { content, title, ...config });
-        });
     },
     /**
      * 打开下载APP弹窗

package/packages/lowcode/src/lowcode.vue

@@ -20,22 +20,16 @@
       <Source :page="page" v-else />
     </es-dialog>
     <es-dialog
-      title="完善页面信息"
+      title="信息完善"
       width="600px"
       height="380px"
       :visible.sync="visible"
       :close-on-click-modal="false"
     >
       <es-form :model="form" :rules="rules" ref="formRef" label-width="80px">
-        <es-form-item label="编码" prop="code">
-          <es-input v-model="form.code" placeholder="请输入编码" />
-        </es-form-item>
         <es-form-item label="名称" prop="name">
           <es-input v-model="form.name" placeholder="请输入名称" />
         </es-form-item>
-        <es-form-item label="标题" prop="title">
-          <es-input v-model="form.title" placeholder="请输入页面标题" />
-        </es-form-item>
         <es-form-item label="描述" prop="description">
           <es-input
             type="textarea"
@@ -43,11 +37,77 @@
             placeholder="请输入描述"
           />
         </es-form-item>
+        <es-form-item label="类型" prop="type">
+          <es-radio-group v-model="form.type">
+            <es-radio label="page">页面</es-radio>
+            <es-radio label="component">组件</es-radio>
+          </es-radio-group>
+        </es-form-item>
+        <es-form-item label="公开" prop="scopeType">
+          <es-radio-group v-model="form.scopeType">
+            <es-radio :label="0">是</es-radio>
+            <es-radio :label="3">否</es-radio>
+          </es-radio-group>
+        </es-form-item>
         <div class="es-lowcode__aside--form-btn">
           <es-button type="primary" @click="submitForm">确定</es-button>
         </div>
       </es-form>
     </es-dialog>
+    <es-dialog
+      :title="publishTitle"
+      width="600px"
+      height="360px"
+      :visible.sync="publishVisible"
+      :close-on-click-modal="false"
+    >
+      <es-form :model="publishForm" ref="publishForm" label-width="80px">
+        <es-form-item label="发布类型">
+          <es-radio-group v-model="scopeType" :disabled="readonly">
+            <es-radio label="菜单">菜单</es-radio>
+            <es-radio label="应用">应用</es-radio>
+          </es-radio-group>
+        </es-form-item>
+        <es-form-item
+          :label="`${scopeType}名称`"
+          prop="name"
+          :disabled="readonly"
+        >
+          <es-input
+            v-model="publishForm.name"
+            :placeholder="`请输入${scopeType}名称`"
+          />
+        </es-form-item>
+        <es-form-item
+          :label="`${scopeType}地址`"
+          prop="url"
+          :disabled="readonly"
+        >
+          <es-input
+            v-model="publishForm.url"
+            :placeholder="`请输入${scopeType}地址`"
+          >
+            <template slot="append"
+              ><es-button @click.stop="copyUrl">复制</es-button></template
+            >
+          </es-input>
+        </es-form-item>
+        <es-form-item :label="`父${scopeType}`" prop="parentId">
+          <es-select
+            v-model="publishForm.parentId"
+            label-key="name"
+            value-key="id"
+            tree
+            :disabled="readonly"
+            :data="parentData"
+            :placeholder="`请选择父${scopeType}`"
+          ></es-select>
+        </es-form-item>
+        <div class="es-lowcode__aside--form-btn" v-show="!readonly">
+          <es-button type="primary" @click="submitPublishForm">确定</es-button>
+        </div>
+      </es-form>
+    </es-dialog>
   </div>
 </template>
 
@@ -78,6 +138,11 @@ export default {
   components: { Toolbar, Aside, Canvas, Attribute },
 
   props: {
+    // url模式
+    urlMode: {
+      type: String,
+      required: true
+    },
     // 页面列表
     pages: {
       type: Array,
@@ -134,7 +199,8 @@ export default {
         name: '',
         title: '',
         code: '',
-        description: ''
+        description: '',
+        scopeType: 0
       },
       rules: {
         name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
@@ -143,6 +209,17 @@ export default {
         //description: [
         //  { required: true, message: '请输入描述', trigger: 'blur' }
         // ]
+      },
+      publishVisible: false,
+      publishTitle: '',
+      readonly: false,
+      scopeType: '菜单',
+      parentData: [],
+      publishForm: {
+        name: '',
+        code: '',
+        url: '',
+        parentId: ''
       }
     };
   },
@@ -249,36 +326,42 @@ export default {
       this.open.type = type;
       this.open.title = type === 'json' ? 'JSON' : '源码';
     });
-    /** 保存 */
-    bus.$on('save', () => {
-      if (!this.page) {
+
+    /** 发布 */
+    bus.$on('publish', (index) => {
+      const page = this.pagesData[index];
+      if (page.id.startsWith('page_')) {
         Message.warning('请先选择要保存的页面');
         return;
       }
-      if (this.save) {
-        this.save(this.page);
-        return;
-      }
-      this.submitPageData();
+      this.publishTitle = page.status === 1 ? '查看' : '发布';
+      const url = this.urlMode?this.urlMode.replace('{id}',page.id):'';
+      this.readonly = page.status === 1;
+      this.publishForm = { name: page.name, pid: page.pid||'', url: url};
+      this.parentData = this.pagesData.filter((item) => item.type === 'page');
+      this.scopeType = page.code ? '应用' : '菜单';
+      this.publishVisible = true;
     });
-    /** 发布 */
-    bus.$on('publish', (genre) => {
-      if (!this.page) {
+
+    /** 保存 */
+    bus.$on('save', (index) => {
+      let page = this.page;
+      if (index !== undefined) {
+        page = this.pagesData[index];
+      } else if (!this.page) {
         Message.warning('请先选择要发布的页面');
         return;
       }
-      this.page.type = genre;
-      if (genre === 'page') {
-        const { name, title, code, description } = this.page;
-        this.form = { name, title, code, description };
-        this.visible = true;
-      } else {
-        if (this.publish) {
-          this.publish(this.page);
-          return;
-        }
-        this.submitPageData({ status: 1 });
-      }
+      const {
+        name,
+        title,
+        code,
+        description,
+        scopeType = 0,
+        type = 'page'
+      } = page;
+      this.form = { name, title, code, description, scopeType, type };
+      this.visible = true;
     });
   },
 
@@ -353,9 +436,7 @@ export default {
     extractPageData() {
       const {
         id,
-        code,
         name,
-        title,
         type,
         description,
         componentConfig,
@@ -372,9 +453,7 @@ export default {
 
       const meta = {
         id,
-        code,
         name,
-        title,
         type,
         description,
         componentConfig,
@@ -394,15 +473,14 @@ export default {
      * 根据页面状态提交保存或更新
      * @param {Object} extraData - 额外的合并数据（如表单数据）
      */
-    submitPageData(extraData = {}) {
+    submitPageData() {
       const { meta, content } = this.extractPageData();
       const data = {
+        status: 0,
         ...meta,
-        content: JSON.stringify(content),
-        ...extraData
+        content: JSON.stringify(content)
       };
 
-      // 根据是否有 id 判断是更新还是新建
       if (meta.status !== undefined) {
         this.updatePage(data);
       } else {
@@ -474,6 +552,11 @@ export default {
     },
     removePage(index) {
       const page = this.pagesData[index];
+      if (page.id.startsWith('page_')) {
+        Message.success('删除成功');
+        this.pagesData.splice(index, 1);
+        return;
+      }
       const loadingInstance = loading('删除中...');
       ajax({
         url: pageDelete,
@@ -524,7 +607,25 @@ export default {
         }
       }
       return null;
-    }
+    },
+    /**
+     * 复制 URL 到剪贴板
+     */
+    copyUrl() {
+      navigator.clipboard.writeText(this.publishForm.url);
+      Message.success('复制成功');
+    },
+    /**
+     * 提交发布表单
+     */
+    submitPublishForm() {
+      this.$refs.publishForm.validate((valid) => {
+        if (valid) {
+          Message.warning('接口暂未开通，请复制地址手动创建菜单或应用');
+          //this.submitPageData(this.publishForm);
+        }
+      });
+    },
   },
   destroyed() {
     // 移除所有事件监听器，防止内存泄漏

package/packages/lowcode/src/pages.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="es-lowcode__pages">
-    <es-scrollbar :class="{'is-page':paginations.total > paginations.pageSize}">
+    <es-scrollbar
+      :class="{ 'is-page': paginations.total > paginations.pageSize }"
+    >
       <div
         v-for="(page, index) in pages"
         :key="page.id"
@@ -11,10 +13,16 @@
         <span class="es-lowcode__pages--item-name">{{
           page.name || page.id
         }}</span>
-        <i
-          class="es-icon-shanchu es-lowcode__pages--item-delete"
-          @click.stop="handleDelete(index)"
-        ></i>
+        <es-dropdown @command="(command) => handleCommand(command, index)">
+          <i class="es-icon-gengduo"></i>
+          <es-dropdown-menu slot="dropdown">
+            <es-dropdown-item command="delete">
+              删除
+            </es-dropdown-item>
+            <es-dropdown-item command="edit">编辑</es-dropdown-item>
+            <es-dropdown-item command="publish">{{page.status === 1 ? '查看' : '发布'}}</es-dropdown-item>
+          </es-dropdown-menu>
+        </es-dropdown>
       </div>
     </es-scrollbar>
     <es-pagination
@@ -57,8 +65,7 @@ export default {
       immediate: true
     }
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     /**
      * 处理页面选择事件
@@ -73,6 +80,19 @@ export default {
       this.active = page.id;
       bus.$emit('selectPage', page);
     },
+    /**
+     * 处理下拉菜单命令事件
+     * @param command 命令
+     */
+    handleCommand(command, index) {
+      if (command === 'delete') {
+        this.handleDelete(index);
+      } else if (command === 'edit') {
+        bus.$emit('save', index);
+      } else if (command === 'publish') {
+        bus.$emit('publish', index);
+      }
+    },
     /**
      * 处理页面删除事件
      * @param index 页面索引

package/packages/lowcode/src/toolbar.vue

@@ -68,9 +68,6 @@
         </es-button>
       </es-button-group>
       <es-button-group separate>
-        <es-button type="primary" size="small" @click="handleSave">
-          保存
-        </es-button>
         <es-button
           type="primary"
           class="es-margin-left-none"
@@ -79,19 +76,10 @@
         >
           预览
         </es-button>
-      </es-button-group>
-      <es-dropdown type="primary" @command="handlePublish" size="small">
-        <es-button type="primary" size="small">
-          发布<i class="es-icon-xia"></i>
+        <es-button type="primary" size="small" @click="handleSave">
+          保存
         </es-button>
-
-        <template #dropdown>
-          <es-dropdown-menu>
-            <es-dropdown-item command="page">发布页面</es-dropdown-item>
-            <es-dropdown-item command="component">发布组件</es-dropdown-item>
-          </es-dropdown-menu>
-        </template>
-      </es-dropdown>
+      </es-button-group>
     </div>
   </div>
 </template>
@@ -154,9 +142,6 @@ export default {
     handlePreview() {
       bus.$emit('preview');
     },
-    handlePublish(command) {
-      bus.$emit('publish', command);
-    }
   }
 };
 </script>